diff --git a/api/controllers/SessionController.js b/api/controllers/SessionController.js
index 800bac5c2d..32532060c8 100755
--- a/api/controllers/SessionController.js
+++ b/api/controllers/SessionController.js
@@ -15,7 +15,7 @@
  * @docs        :: http://sailsjs.org/#!documentation/controllers
  */
 
-var bcrypt = require('bcrypt');
+var bcrypt = require('bcryptjs');
 var crypto = require('crypto');
 
 module.exports = {
diff --git a/api/models/User.js b/api/models/User.js
index 48d37bdf1c..2fd48475c2 100755
--- a/api/models/User.js
+++ b/api/models/User.js
@@ -216,7 +216,7 @@ module.exports = {
 
     delete values.confirmation;
 
-      require('bcrypt').hash(values.password, 10, function passwordEncrypted(err, encryptedPassword) {
+      require('bcryptjs').hash(values.password, 10, function passwordEncrypted(err, encryptedPassword) {
         if (err) return next(err);
         values.password = encryptedPassword;
         // values.online= true;
diff --git a/api/services/SpeakService.js b/api/services/SpeakService.js
index 3c3d4b89e7..680e5a91e9 100644
--- a/api/services/SpeakService.js
+++ b/api/services/SpeakService.js
@@ -13,7 +13,7 @@ if(sails.config.machine.soundCapable){
 	var lame = require('lame');
 	var Speaker = require('speaker');
 	var http = require('http');
-	var md5 = require('MD5');
+	var md5 = require('md5');
 
 	/**
 	 * Downloading a file of an given 'url',
diff --git a/package.json b/package.json
index 8900cd934d..6ea24b3eed 100755
--- a/package.json
+++ b/package.json
@@ -4,11 +4,11 @@
   "description": "Your personnal assistant, always here.",
   "keywords": [],
   "dependencies": {
-    "MD5": "~1.2.1",
+    "md5": "~2.0.0",
     "apriori": "~1.0.4",
     "async": "~0.9.0",
     "barrels": "~1.4.0",
-    "bcrypt": "0.8.0",
+    "bcryptjs": "2.3.0",
     "crypto": "~0.0.3",
     "ejs": "~0.8.4",
     "google-contacts": "~0.0.2",
diff --git a/update.js b/update.js
index ab5b143f70..7aa0f9fb17 100644
--- a/update.js
+++ b/update.js
@@ -6,7 +6,7 @@ var path = require('path');
 var BACKUP_FOLDERNAME = ".GladysBackUp";
 
 var filesToKeep = [
-	  'config/connections.js',
+    'config/connections.js',
     'config/serialport.js',
     'config/machine.js',
     'config/googleapi.js',