diff --git a/src/cli/oneuser b/src/cli/oneuser
index b74176ef3d..2f3e908427 100755
--- a/src/cli/oneuser
+++ b/src/cli/oneuser
@@ -40,7 +40,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     helper = OneUserHelper.new
 
     before_proc do
-        helper.set_client(options)
+        helper.set_client(options) if @comm_name != :login
     end
 
     ########################################################################