diff --git a/wp-includes/author-template.php b/wp-includes/author-template.php
index 3c287b0da..e250fe969 100644
--- a/wp-includes/author-template.php
+++ b/wp-includes/author-template.php
@@ -164,6 +164,10 @@ function the_author_email() {
  */
 function get_the_author_url() {
 	global $authordata;
+
+	if ( 'http://' == $authordata>user_url )
+		return '';
+
 	return $authordata->user_url;
 }
 
diff --git a/wp-includes/feed-atom.php b/wp-includes/feed-atom.php
index 265c08074..e4c831c3f 100644
--- a/wp-includes/feed-atom.php
+++ b/wp-includes/feed-atom.php
@@ -26,7 +26,9 @@ $more = 1;
 	<entry>
 		<author>
 			<name><?php the_author() ?></name>
+			<?php $author_url = get_the_author_url(); if ( !empty($author_url) ) : ?>
 			<uri><?php the_author_url()?></uri>
+			<?php endif; ?>
 		</author>
 		<title type="<?php html_type_rss(); ?>"><![CDATA[<?php the_title_rss() ?>]]></title>
 		<link rel="alternate" type="text/html" href="<?php permalink_single_rss() ?>" />