diff --git a/wp-admin/includes/theme.php b/wp-admin/includes/theme.php
index 2058058e93..f8071bfaea 100644
--- a/wp-admin/includes/theme.php
+++ b/wp-admin/includes/theme.php
@@ -410,7 +410,8 @@ function wp_prepare_themes_for_js( $themes = null ) {
 			'name'         => $theme->display( 'Name' ),
 			'screenshot'   => array( $theme->get_screenshot() ), // @todo multiple
 			'description'  => $theme->display( 'Description' ),
-			'author'       => $theme->display( 'Author' ),
+			'author'       => $theme->display( 'Author', false, true ),
+			'authorAndUri' => $theme->display( 'Author' ),
 			'version'      => $theme->display( 'Version' ),
 			'tags'         => $theme->display( 'Tags' ),
 			'parent'       => $parent,
diff --git a/wp-admin/themes.php b/wp-admin/themes.php
index bad7c45ef6..c6ac0718a1 100644
--- a/wp-admin/themes.php
+++ b/wp-admin/themes.php
@@ -273,7 +273,7 @@ if ( ! is_multisite() && current_user_can('edit_themes') && $broken_themes = wp_
 					<span class="current-label"><?php _e( 'Current Theme' ); ?></span>
 				<# } #>
 				<h3 class="theme-name">{{{ data.name }}}<span class="theme-version"><?php printf( __( 'Version: %s' ), '{{{ data.version }}}' ); ?></span></h3>
-				<h4 class="theme-author"><?php printf( __( 'By %s' ), '{{{ data.author }}}' ); ?></h4>
+				<h4 class="theme-author"><?php printf( __( 'By %s' ), '{{{ data.authorAndUri }}}' ); ?></h4>
 
 				<# if ( data.hasUpdate ) { #>
 				<div class="theme-update-message">