diff --git a/app/controllers/users/users.authentication.server.controller.js b/app/controllers/users/users.authentication.server.controller.js
index 0acb65a8..55da25ba 100755
--- a/app/controllers/users/users.authentication.server.controller.js
+++ b/app/controllers/users/users.authentication.server.controller.js
@@ -60,20 +60,17 @@ var config_nev = function () {
 config_nev();
 
 exports.validateVerificationToken = function(req, res){
+	console.log(req.user);
 	nev.confirmTempUser(req.params.token, function(err, user) {
-	    //FIXME: Quick hack to prevent already verified users from seeing link has expired page
-	    if(errorHandler.getErrorMessage(err) === "Unique field already exists") {
-		return res.status(200).send('User successfully verified');
-	    }   
-		
+	    console.log(err);
 	    if(err) {
-		return res.status(500).send( {message: errorHandler.getErrorMessage(err) } );
+		return res.status(500).send( {message: err } );
 	    }
 	    else if (user){
 	        return res.status(200).send('User successfully verified');
 	    }
 	    // redirect to resend verification email
-	    return res.status(400).send( {message: 'Verification token is invalid or has expired'} );
+	    else return res.status(400).send( {message: 'Verification token is invalid or has expired'} );
 	});
 };
 
diff --git a/package.json b/package.json
index 64967ac2..8bc8fc58 100644
--- a/package.json
+++ b/package.json
@@ -106,6 +106,7 @@
     "coveralls": "^2.11.4",
     "cross-spawn": "^5.0.0",
     "del": "^2.2.2",
+    "email-verification": "github:tellform/node-email-verification",
     "grunt-closure-compiler": "0.0.21",
     "grunt-contrib-concat": "^1.0.1",
     "grunt-contrib-copy": "^1.0.0",