diff --git a/src/authm_mad/remotes/x509/authenticate b/src/authm_mad/remotes/x509/authenticate
index 6bbf96ffd4..c3ae16bffb 100755
--- a/src/authm_mad/remotes/x509/authenticate
+++ b/src/authm_mad/remotes/x509/authenticate
@@ -44,7 +44,7 @@ proxy, cert = dsecret.split(':')
 
 x509_auth   = X509Auth.new(:cert=>cert)
 
-rc = x509_auth.authenticate(user,pass,proxy)
+rc = x509_auth.authenticate(pass,proxy)
 
 if rc == true
     exit 0
diff --git a/src/authm_mad/remotes/x509/x509_auth.rb b/src/authm_mad/remotes/x509/x509_auth.rb
index 3010e58c2c..386f0f8efa 100644
--- a/src/authm_mad/remotes/x509/x509_auth.rb
+++ b/src/authm_mad/remotes/x509/x509_auth.rb
@@ -88,7 +88,7 @@ class X509Auth
     # Server side
     ###########################################################################
     # auth method for auth_mad
-    def authenticate(user, pass, token)        
+    def authenticate(pass, token)        
         begin
             plain = decrypt(token)
         
@@ -108,7 +108,7 @@ class X509Auth
  
 private
     ###########################################################################
-    #                       Methods to handle ssh keys
+    #                       Methods to encrpyt/decrypt keys
     ###########################################################################
     # Encrypts data with the private key of the user and returns
     # base 64 encoded output in a single line