diff --git a/src/Database/Models/ContactChangeModel.cs b/src/Database/Models/ContactChangeModel.cs
index b7ffe7d570c1cc581a06b29c69b54c30859c3dfb..453638024e0e1a56c1d3e0b2c0a376b1d8e49aea 100644
--- a/src/Database/Models/ContactChangeModel.cs
+++ b/src/Database/Models/ContactChangeModel.cs
@@ -47,9 +47,9 @@ namespace Coscine.Database.Models
             return contactChangeObjects;
         }
 
-        public UserObject ExecuteConfirmation(Guid userId, Guid token)
+        public UserObject ExecuteConfirmation(Guid token)
         {
-            ContactChange emailData = GetWhere((contactChange) => contactChange.UserId == userId && contactChange.ConfirmationToken == token);
+            ContactChange emailData = GetWhere((contactChange) => contactChange.ConfirmationToken == token);
             if (emailData != null)
             {
                 if (emailData.EditDate != null)
@@ -63,30 +63,30 @@ namespace Coscine.Database.Models
                     {
                         // VALID
                         UserModel userModel = new UserModel();
-                        User user = userModel.GetById(userId);
+                        User user = userModel.GetById(emailData.UserId);
                         user.EmailAddress = emailData.NewEmail; // Overwrite old Email with New.
                         userModel.Update(user); // Update Database (User Table).
                         Delete(emailData); // Delete Entry from Database (ContactChange Table).
-                        UserObject userObject = userModel.CreateReturnObjectFromDatabaseObject(userModel.GetWhere((usr) => usr.Id == userId));
+                        UserObject userObject = userModel.CreateReturnObjectFromDatabaseObject(userModel.GetWhere((usr) => usr.Id == emailData.UserId));
                         return userObject;
                     }
                     else
                     {
                         // EXPIRED
-                        throw new Exception("EXPIRED: Token " + token.ToString() + " for User with an ID " + userId.ToString() + " has expired.");
+                        throw new Exception("EXPIRED: Token " + token.ToString() + " has expired.");
                     }
                 }
                 else
                 {
                     // INVALID (null EditDate)
-                    throw new ArgumentNullException("INVALID: Value EditDate is NULL for Token " + token.ToString() + " and User with an ID " + userId.ToString() + ".");
+                    throw new ArgumentNullException("INVALID: Value EditDate is NULL for Token " + token.ToString() + ".");
                 }
 
             }
             else
             {
                 // INVALID (token-user combination not in Database)
-                throw new MissingFieldException("INVALID: The Token " + token.ToString() + " and User with an ID " + userId.ToString() + " combination is not valid. No entry inside the Database.");
+                throw new MissingFieldException("INVALID: The Token " + token.ToString() + " is not valid. No entry inside the Database.");
             }
         }