diff --git a/ccserver/conf.py b/ccserver/conf.py
index 1192275ae546aaf95a1c29c879f7dcddac8fadc5..f1bb83756ea46563c08bac26ee67e3f712912c9e 100644
--- a/ccserver/conf.py
+++ b/ccserver/conf.py
@@ -140,11 +140,11 @@ class CCConf(object):
         digest = hashlib.sha1(str(provided_passwd) + salt).digest()
         return '{SSHA}%s' % base64.b64encode(digest + salt)
 
-    def _auth_sha(self, configured_passwd, provided_passwd):
+    def _auth_sha(self, provided_passwd, configured_passwd=None):
         digest = hashlib.sha1(str(provided_passwd)).digest()
         return '{SHA}%s' % base64.b64encode(digest)
 
-    def _auth_smd5(self, configured_passwd, provided_passwd):
+    def _auth_smd5(self, provided_passwd, configured_passwd=None):
         if configured_passwd is not None:
             salt = self._unsaltify(configured_passwd, 16)[1]
         else:
@@ -152,11 +152,11 @@ class CCConf(object):
         digest = hashlib.sha1(str(provided_passwd) + salt).digest()
         return '{SMD5}%s' % base64.b64encode(digest + salt)
 
-    def _auth_md5(self, configured_passwd, provided_passwd):
+    def _auth_md5(self, provided_passwd, configured_passwd=None):
         digest = hashlib.sha1(str(provided_passwd)).digest()
         return '{MD5}%s' % base64.b64encode(digest)
 
-    def _auth_plain(self, configured_passwd, provided_passwd):
+    def _auth_plain(self, provided_passwd, configured_passwd=None):
         return provided_passwd
 
     def _hash_password(self, password, method='ssha'):