Index: wp-includes/general-template.php
===================================================================
--- wp-includes/general-template.php	(revision 17614)
+++ wp-includes/general-template.php	(working copy)
@@ -404,10 +404,10 @@
 		case 'siteurl' : // DEPRECATED
 			_deprecated_argument( __FUNCTION__, '2.2', sprintf( __('The <code>%s</code> option is deprecated for the family of <code>bloginfo()</code> functions.' ), $show ) . ' ' . sprintf( __( 'Use the <code>%s</code> option instead.' ), 'url'  ) );
 		case 'url' :
-			$output = home_url();
+			$output = home_url( '', ( force_ssl_admin() || force_ssl_login() ) && !is_ssl() ? 'http' : null );
 			break;
 		case 'wpurl' :
-			$output = site_url();
+			$output = site_url( '', ( force_ssl_admin() || force_ssl_login() ) && !is_ssl() ? 'http' : null );
 			break;
 		case 'description':
 			$output = get_option('blogdescription');
Index: wp-login.php
===================================================================
--- wp-login.php	(revision 17614)
+++ wp-login.php	(working copy)
@@ -86,7 +86,7 @@
 <?php   if ( !is_multisite() ) { ?>
 <div id="login"><h1><a href="<?php echo apply_filters('login_headerurl', 'http://wordpress.org/'); ?>" title="<?php echo apply_filters('login_headertitle', esc_attr__('Powered by WordPress')); ?>"><?php bloginfo('name'); ?></a></h1>
 <?php   } else { ?>
-<div id="login"><h1><a href="<?php echo apply_filters('login_headerurl', network_home_url() ); ?>" title="<?php echo apply_filters('login_headertitle', esc_attr($current_site->site_name) ); ?>"><span class="hide"><?php bloginfo('name'); ?></span></a></h1>
+<div id="login"><h1><a href="<?php echo apply_filters('login_headerurl', network_home_url( '', ( force_ssl_admin() || force_ssl_login() ) && !is_ssl() ? 'http' : null  ) ); ?>" title="<?php echo apply_filters('login_headertitle', esc_attr($current_site->site_name) ); ?>"><span class="hide"><?php bloginfo('name'); ?></span></a></h1>
 <?php   }
 
 	$message = apply_filters('login_message', $message);