diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index d2c25fdc4d..79f46149d0 100755
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -3749,7 +3749,7 @@ static int parse_contact(struct sip_pvt *pvt, struct sip_peer *p, struct sip_req
 	/* Save User agent */
 	useragent = get_header(req, "User-Agent");
 	if(useragent && strcasecmp(useragent, p->useragent)) {
-		strncpy(p->useragent, get_header(req, "User-Agent"),sizeof(p->useragent));
+		strncpy(p->useragent, useragent, sizeof(p->useragent));
 		if (option_verbose > 2) {
 			ast_verbose(VERBOSE_PREFIX_3 "Saved useragent \"%s\" for peer %s\n",p->useragent,p->name);  
 		}
diff --git a/cli.c b/cli.c
index af9aa45b83..a48ce4b7e0 100755
--- a/cli.c
+++ b/cli.c
@@ -770,7 +770,7 @@ static int help_workhorse(int fd, char *match[])
 				continue;
 			}
 		}
-		ast_cli(fd, "%20.20s   %s\n", fullcmd, e->summary);
+		ast_cli(fd, "%25.25s  %s\n", fullcmd, e->summary);
 	}
 	return 0;
 }