NickServ - WIP Commit 7