diff --git a/django-openstack/django_openstack/api.py b/django-openstack/django_openstack/api.py
index 3361d686e..6e9aa5fe1 100644
--- a/django-openstack/django_openstack/api.py
+++ b/django-openstack/django_openstack/api.py
@@ -247,10 +247,10 @@ def account_api(request):
     LOG.debug('account_api connection created using token "%s"'
                       ' and url "%s"' %
                   (request.session['token'],
-                   url_for(request, 'keystone', True)))
+                   url_for(request, 'identity', True)))
     return openstackx.extras.Account(
         auth_token=request.session['token'],
-        management_url=url_for(request, 'keystone', True))
+        management_url=url_for(request, 'identity', True))
 
 
 def glance_api(request):
diff --git a/django-openstack/django_openstack/auth/views.py b/django-openstack/django_openstack/auth/views.py
index b3d9323fd..3c097d8c7 100644
--- a/django-openstack/django_openstack/auth/views.py
+++ b/django-openstack/django_openstack/auth/views.py
@@ -34,7 +34,7 @@ LOG = logging.getLogger('django_openstack.auth')
 
 class Login(forms.SelfHandlingForm):
     username = forms.CharField(max_length="20", label="User Name")
-    password = forms.CharField(max_length="20", label="Password")
+    password = forms.CharField(max_length="20", label="Password", widget=forms.PasswordInput(render_value=False))
 
     def handle(self, request, data):
         try:
diff --git a/django-openstack/django_openstack/tests/api_tests.py b/django-openstack/django_openstack/tests/api_tests.py
index fb48509a0..460c975b8 100644
--- a/django-openstack/django_openstack/tests/api_tests.py
+++ b/django-openstack/django_openstack/tests/api_tests.py
@@ -443,9 +443,9 @@ class AccountApiTests(test.TestCase):
 
         self.mox.StubOutWithMock(api, 'url_for')
         api.url_for(
-                IsA(http.HttpRequest), 'keystone', True).AndReturn(TEST_URL)
+                IsA(http.HttpRequest), 'identity', True).AndReturn(TEST_URL)
         api.url_for(
-                IsA(http.HttpRequest), 'keystone', True).AndReturn(TEST_URL)
+                IsA(http.HttpRequest), 'identity', True).AndReturn(TEST_URL)
 
         self.mox.ReplayAll()