diff --git a/html/html.c b/html/html.c
index 79d7d8b..a6f708f 100755
--- a/html/html.c
+++ b/html/html.c
@@ -78,7 +78,6 @@ static int
 rndr_autolink(struct buf *ob, const struct buf *link, enum mkd_autolink type, void *opaque)
 {
 	struct html_renderopt *options = opaque;
-	uint8_t offset = 0;

 	if (!link || !link->size)
 		return 0;
@@ -91,11 +90,9 @@ rndr_autolink(struct buf *ob, const struct buf *link, enum mkd_autolink type, vo
 	BUFPUTSL(ob, "<a href=\"");
 	if (type == MKDA_EMAIL)
 		BUFPUTSL(ob, "mailto:");
-	if (type == MKDA_REDDIT_USERNAME) {
+	if (type == MKDA_REDDIT_USERNAME)
 		BUFPUTSL(ob, "/user/");
-		offset = 1;
-	}
-	escape_href(ob, link->data + offset, link->size - offset);
+	escape_href(ob, link->data, link->size);

 	if (options->link_attributes) {
 		bufputc(ob, '\"');
diff --git a/src/autolink.c b/src/autolink.c
index c1a6a5a..043ec3f 100644
--- a/src/autolink.c
+++ b/src/autolink.c
@@ -292,7 +292,7 @@ sd_autolink__subreddit(size_t *rewind_p, struct buf *link, uint8_t *data, size_t
 }

 size_t
-sd_autolink__username(size_t *rewind_p, struct buf *link, uint8_t *data, size_t offset, size_t size)
+sd_autolink__username(size_t *fast_forward_p, struct buf *link, uint8_t *data, size_t offset, size_t size)
 {
 	size_t link_end;

@@ -313,7 +313,7 @@ sd_autolink__username(size_t *rewind_p, struct buf *link, uint8_t *data, size_t

 	/* make the link */
 	bufput(link, data, link_end);
-	*rewind_p = 0;
+	*fast_forward_p = 1;

 	return link_end;
 }
diff --git a/src/autolink.h b/src/autolink.h
index f263b33..8c7411a 100644
--- a/src/autolink.h
+++ b/src/autolink.h
@@ -35,7 +35,7 @@ extern size_t
 sd_autolink__subreddit(size_t *rewind_p, struct buf *link, uint8_t *data, size_t offset, size_t size);

 extern size_t
-sd_autolink__username(size_t *rewind_p, struct buf *link, uint8_t *data, size_t offset, size_t size);
+sd_autolink__username(size_t *fast_forward_p, struct buf *link, uint8_t *data, size_t offset, size_t size);

 #endif

diff --git a/src/markdown.c b/src/markdown.c
index 999fc6e..f197f91 100644
--- a/src/markdown.c
+++ b/src/markdown.c
@@ -832,14 +832,14 @@ static size_t
 char_autolink_username(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t offset, size_t size)
 {
 	struct buf *link;
-	size_t link_len, rewind;
+	size_t link_len, fast_forward;

 	if (!rndr->cb.autolink || rndr->in_link_body)
 		return 0;

 	link = rndr_newbuf(rndr, BUFFER_SPAN);
-	if ((link_len = sd_autolink__username(&rewind, link, data, offset, size)) > 0) {
-		ob->size -= rewind;
+	if ((link_len = sd_autolink__username(&fast_forward, link, data, offset, size)) > 0) {
+		ob->size += fast_forward;
 		rndr->cb.autolink(ob, link, MKDA_REDDIT_USERNAME, rndr->opaque);
 	}
 	rndr_popbuf(rndr, BUFFER_SPAN);