diff --git a/django/conf/admin_templates/base.html b/django/conf/admin_templates/base.html
index dc0b18faef..759b86de2c 100644
--- a/django/conf/admin_templates/base.html
+++ b/django/conf/admin_templates/base.html
@@ -20,7 +20,7 @@
         {% block branding %}{% endblock %}
         </div>
         {% if not user.is_anonymous %}
-        <div id="user-tools">Welcome, <strong>{% if user.first_name %}{{ user.first_name }}{% else %}{{ user.username }}{% endif %}</strong>. <br /><a href="/password_change/">Change password</a> / <a href="/logout/">Logout</a></div>
+        <div id="user-tools">Welcome, <strong>{% if user.first_name %}{{ user.first_name }}{% else %}{{ user.username }}{% endif %}</strong>. <br />{% block userlinks %}{% comment %}<a href="/admin/password_change/">Change password</a> / {% endcomment %}<a href="/admin/logout/">Log out</a>{% endblock %}</div>
         {% endif %}
         {% block nav-global %}{% endblock %}
         <br class="clear" />
diff --git a/django/conf/admin_templates/logged_out.html b/django/conf/admin_templates/logged_out.html
index 3a11841248..30b80a78e2 100644
--- a/django/conf/admin_templates/logged_out.html
+++ b/django/conf/admin_templates/logged_out.html
@@ -4,6 +4,6 @@
 
 <p>Thanks for spending some quality time with the Web site today.</p>
 
-<p><a href="/">Log in again</a></p>
+<p><a href="/admin/">Log in again</a></p>
 
 {% endblock %}