diff --git a/author.php b/author.php
index cfd269e..01a984d 100644
--- a/author.php
+++ b/author.php
@@ -3,8 +3,7 @@
 	
 <?php 
 	if(get_query_var('author_name') ) {
-		// NOTE: 2.0 bug requires: get_userdatabylogin(get_the_author_login());
-		$curauth = get_userdatabylogin(get_query_var('author_name'));
+		$curauth = get_user_by('slug', get_query_var('author_name'));
 	} else {
 		$curauth = get_userdata(get_query_var('author'));
 	}
diff --git a/functions/displaypost.php b/functions/displaypost.php
index f40e57e..828ef97 100644
--- a/functions/displaypost.php
+++ b/functions/displaypost.php
@@ -44,8 +44,9 @@ function comicpress_display_post_calendar($is_comic = false) {
 }
 
 function comicpress_display_post_author() {
-	global $post;
-	$post_author = "<span class=\"post-date\">".get_the_time('F jS, Y')."</span> <span class=\"pipe\">|</span> <span class=\"post-author\">  ".__(' by ','comicpress'). get_the_author_meta('display_name')."</span>\r\n";
+	global $post,$authordata;
+
+	$post_author = "<span class=\"post-date\">".get_the_time('F jS, Y')."</span> <span class=\"pipe\">|</span> <span class=\"post-author\">  ".__(' by ','comicpress')."<a href=\"".get_author_posts_url( $authordata->ID, $authordata->user_nicename )."\">".get_the_author()."</a></span>\r\n";
 	echo apply_filters('comicpress_display_post_author',$post_author);
 }