diff --git a/src/User.py b/src/User.py
index 0b5696097..6fd0a06a7 100755
--- a/src/User.py
+++ b/src/User.py
@@ -146,6 +146,7 @@ class User(callbacks.Privmsg):
             isOwner = caller.checkCapability('owner')
         except KeyError:
             caller = None
+            isOwner = False
         if not conf.supybot.databases.users.allowUnregistration():
             if not caller or not isOwner:
                 self.log.warning('%s tried to unregister user %s.',
@@ -310,7 +311,9 @@ class User(callbacks.Privmsg):
                 else:
                     try:
                         user = ircdb.users.getUser(name)
-                        irc.reply(repr(user.hostmasks))
+                        hostmasks = map(repr, user.hostmasks)
+                        hostmasks.sort()
+                        irc.reply(utils.commaAndify(hostmasks))
                     except KeyError:
                         irc.errorNoUser()
             else:
diff --git a/test/test_User.py b/test/test_User.py
index eeeb5317b..0eb5dc258 100644
--- a/test/test_User.py
+++ b/test/test_User.py
@@ -36,13 +36,16 @@ class UserTestCase(PluginTestCase, PluginDocumentation):
     plugins = ('User',)
     prefix1 = 'somethingElse!user@host.tld'
     prefix2 = 'EvensomethingElse!user@host.tld'
-##     def testHostmasks(self):
-##         self.assertNotError('hostmasks')
-##         original = self.prefix
-##         self.prefix = self.prefix1
-##         self.assertNotError('register foo bar')
-##         self.prefix = original
-##         self.assertRegexp('hostmasks foo', 'only.*your.*own')
+    def testHostmasks(self):
+        self.assertError('hostmasks')
+        original = self.prefix
+        self.prefix = self.prefix1
+        self.assertNotError('register foo bar')
+        self.prefix = original
+        self.assertError('hostmasks foo')
+        self.assertNotError('addhostmask foo [hostmask] bar')
+        self.assertNotError('hostmasks foo')
+        self.assertNotRegexp('hostmasks foo', 'IrcSet')
 
     def testRegisterUnregister(self):
         self.prefix = self.prefix1
@@ -93,13 +96,14 @@ class UserTestCase(PluginTestCase, PluginDocumentation):
             self.assertNotError('setpassword foo bar baz')
             self.assertEqual(ircdb.users.getUser(self.prefix).password, 'baz')
             self.assertNotError('setpassword --hashed foo baz biff')
-            self.assertNotEqual(ircdb.users.getUser(self.prefix).password, 'biff')
+            self.assertNotEqual(ircdb.users.getUser(self.prefix).password,
+                                'biff')
         finally:
             conf.supybot.databases.users.hash.setValue(orig)
 
     def testStats(self):
         self.assertNotError('user stats')
-        self.assertNotError('load FunDB')
+        self.assertNotError('load Lart')
         self.assertNotError('user stats')
 
     def testUserPluginAndUserList(self):