diff --git a/modules/nickserv.cpp b/modules/nickserv.cpp
index e8c69eb1..4bc86d2f 100644
--- a/modules/nickserv.cpp
+++ b/modules/nickserv.cpp
@@ -23,8 +23,11 @@ public:
 	{
 		if (sArgs.empty())
 			m_sPass = GetNV("Password");
-		else
+		else {
 			m_sPass = sArgs;
+			SetNV("Password", m_sPass);
+			SetArgs("");
+		}
 
 		return true;
 	}