diff --git a/swift/common/middleware/tempauth.py b/swift/common/middleware/tempauth.py
index d874017ccf..f6d2fe8d26 100644
--- a/swift/common/middleware/tempauth.py
+++ b/swift/common/middleware/tempauth.py
@@ -85,7 +85,7 @@ class TempAuth(object):
                     if ip == '0.0.0.0':
                         ip = '127.0.0.1'
                     url += ip
-                    url += ':' + conf.get('bind_port', 80) + '/v1/' + \
+                    url += ':' + conf.get('bind_port', '8080') + '/v1/' + \
                            self.reseller_prefix + conf_key.split('_')[1]
                 groups = values
                 self.users[conf_key.split('_', 1)[1].replace('_', ':')] = {
diff --git a/test/unit/common/middleware/test_tempauth.py b/test/unit/common/middleware/test_tempauth.py
index ebf2b5335e..02519c7ce2 100644
--- a/test/unit/common/middleware/test_tempauth.py
+++ b/test/unit/common/middleware/test_tempauth.py
@@ -384,5 +384,23 @@ class TestAuth(unittest.TestCase):
         self.assertEquals(resp.status_int, 401)
 
 
+class TestParseUserCreation(unittest.TestCase):
+    def test_parse_user_creation(self):
+        auth_filter = auth.filter_factory({
+            'user_test_tester3': 'testing',
+            'user_admin_admin': 'admin .admin .reseller_admin',
+        })(FakeApp())
+        self.assertEquals(auth_filter.users, {
+            'admin:admin': {
+                'url': 'http://127.0.0.1:8080/v1/AUTH_admin', 
+                'groups': ['.admin', '.reseller_admin'], 
+                'key': 'admin'
+            }, 'test:tester3': {
+                'url': 'http://127.0.0.1:8080/v1/AUTH_test', 
+                'groups': [], 
+                'key': 'testing'
+            },
+        })
+
 if __name__ == '__main__':
     unittest.main()