diff --git a/src/libs/models/resetToken.js b/src/libs/models/resetToken.js
index abed97cad98eb90f0f1cc0c2f56f07a252db070e..db5842f33c8009f9e79cdda19f22a3a57d9e9004 100644
--- a/src/libs/models/resetToken.js
+++ b/src/libs/models/resetToken.js
@@ -23,7 +23,8 @@ let ResetToken = new Schema({
     createdAt: {
         type: Date,
         required: true,
-        default: Date.now
+        default: Date.now,
+        expires: 86400 //Seconds in a Day
     }
 });
 
diff --git a/src/libs/models/user.js b/src/libs/models/user.js
index 95b5807341121bd4b55d8b51a2af1cc6622515a5..7857bec4d6b6e67bd3ecb98aaf9a6f091cfebe51 100644
--- a/src/libs/models/user.js
+++ b/src/libs/models/user.js
@@ -74,11 +74,11 @@ var UserSchema = new Schema({
 });
 
 UserSchema.methods.encryptPassword = function(password) {
-    return crypto.pbkdf2Sync(password, this.salt, 10000, 512, 'sha512');
+    return crypto.pbkdf2Sync(password+'', this.salt, 10000, 512, 'sha512');
 };
 
 UserSchema.virtual('password').set(function(password) {
-    this._plainPassword = password;
+    this._plainPassword = password+'';
     this.salt = crypto.randomBytes(128).toString('hex');
     this.hashedPassword = this.encryptPassword(password).toString('hex');
 }).get(function() {