diff --git a/docs/api/modules/nickuser.rst b/docs/api/modules/nickuser.rst
index 73c3d3e..76e2f49 100644
--- a/docs/api/modules/nickuser.rst
+++ b/docs/api/modules/nickuser.rst
@@ -2,7 +2,7 @@
 ===================================================
 
 A module providing a simple login/logout account service. "Trust" is based upon
-hostname - logging in autorizes your current hostname for your account data, 
+hostname - logging in autorizes your current hostname for your account data,
 which is tied to your nick.
 
 Commands
@@ -21,6 +21,24 @@ Commands
 
     Log out of account (deauthorize your current hostname)
 
+Utilities
+---------
+
+NickUser provides a decorator that can be used to lock module commands methods
+behind a login:
+
+.. code-block:: python
+
+    from pyircbot.modulebase import ModuleBase, command
+    from pyircbot.modules.NickUser import protected
+
+    class MyModule(ModuleBase):
+
+        @command("foo", allow_private=True)
+        @protected()
+        def cmd_foo(self, message, command):
+            print(message.prefix.nick, "called foo whiled logged in!")
+
 Class Reference
 ---------------
 
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 661680e..dfc163b 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -3,6 +3,7 @@ Changelog
 =========
 
 * :feature:`-` Added StockPlay module
+* :feature:`-` Added `@protected` decorator
 
 * :release:`4.1.0 <2019-02-10>`
 * :support:`-` First documented release in awhile. Many new modules and tests have been added. See the git log if you so desire.
diff --git a/pyircbot/modules/NickUser.py b/pyircbot/modules/NickUser.py
index 3498742..ecdb4b2 100755
--- a/pyircbot/modules/NickUser.py
+++ b/pyircbot/modules/NickUser.py
@@ -50,6 +50,7 @@ class NickUser(ModuleBase):
                 oldpass = attr.getKey(prefix.nick, "password")
                 if oldpass is None:
                     attr.setKey(prefix.nick, "password", cmd.args[0])
+                    attr.setKey(prefix.nick, "loggedinfrom", prefix.hostname)
                     self.bot.act_PRIVMSG(prefix.nick, ".setpass: You've been logged in and "
                                                       "your password has been set to \"%s\"." % cmd.args[0])
                 else:
@@ -74,10 +75,8 @@ class NickUser(ModuleBase):
             else:
                 if len(cmd.args) == 1:
                     if userpw == cmd.args[0]:
-                        #################
                         attr.setKey(prefix.nick, "loggedinfrom", prefix.hostname)
                         self.bot.act_PRIVMSG(prefix.nick, ".login: You have been logged in from: %s" % prefix.hostname)
-                        #################
                     else:
                         self.bot.act_PRIVMSG(prefix.nick, ".login: incorrect password.")
                 else:
@@ -95,7 +94,6 @@ class NickUser(ModuleBase):
 
 # Decorator for methods that require login
 # Assumes your args matches the same format that @command(...) expects
-#TODO better docs
 class protected(object):
     def __init__(self, message=None):
         self.message = message or "{}: you need to .login to do that"
@@ -106,7 +104,8 @@ class protected(object):
             login = module.bot.getBestModuleForService("login")
 
             if not login.check(message.prefix.nick, message.prefix.hostname):
-                module.bot.act_PRIVMSG(message.args[0], self.message.format(message.prefix.nick))
+                module.bot.act_PRIVMSG(message.args[0] if message.args[0].startswith("#") else message.prefix.nick,
+                                       self.message.format(message.prefix.nick))
                 return
 
             func(*args, **kwargs)