diff --git a/lib/whimsy/asf/svn.rb b/lib/whimsy/asf/svn.rb
index dea083c8f5..cd030f58a3 100644
--- a/lib/whimsy/asf/svn.rb
+++ b/lib/whimsy/asf/svn.rb
@@ -354,11 +354,9 @@ def self._svn_build_cmd(command, path, options)
         cmd[0] = 'whimsysvn' # need wrapper for SVN proxy role
       end
       unless options[:dryrun] # don't add auth for dryrun
-        if password or user == 'whimsysvn' # whimsysvn user does not require password
-          cmd << ['--username', user, '--no-auth-cache']
-        end
         # password was supplied, add credentials
         if password
+          cmd << ['--username', user, '--no-auth-cache']
           if self.passwordStdinOK?()
             stdin = password
             cmd << ['--password-from-stdin']