diff --git a/scripts/create_admin.js b/scripts/create_admin.js
index 6d5ee5c6..1e224834 100644
--- a/scripts/create_admin.js
+++ b/scripts/create_admin.js
@@ -23,7 +23,7 @@ exports.run = function(app, db, cb) {
 		}
 
 		if(!user){
-			newUser.save(function (userErr) {
+			user.save(function (userErr) {
 				if (userErr) {
 					return cb(userErr);
 				}
diff --git a/scripts/setup.js b/scripts/setup.js
index 84c0e837..e91f29fa 100644
--- a/scripts/setup.js
+++ b/scripts/setup.js
@@ -66,7 +66,6 @@ var createOrUpdateAdminUser = function(username, email, password, cb){
 		lastName: 'Account',
 		username: username,
 		email: email,
-		password: pass,
 		provider: 'local',
 		roles: ['admin', 'user']
 	}
@@ -77,22 +76,38 @@ var createOrUpdateAdminUser = function(username, email, password, cb){
 		setDefaultsOnInsert: true
 	}
 
-	User.findOneAndUpdate({ username: username, email: email }, updateObj, options, function (err, result) {
+	User.findOneAndUpdate({ username: username }, updateObj, options, function (err, user) {
 		if (err) {
+			delete pass;
+			delete email;
+			delete username;
 			return cb(err);
 		}
 
-		if(!result){
+		if(!user){
+			delete pass;
+			delete email;
+			delete username;
 			return cb(new Error('Admin User could not be created'));
 		}
 
-		delete pass;
-		delete email;
-		delete username;
+		user.password = password
+		user.save(function(err) {
+			if(err){
+				delete pass;
+				delete email;
+				delete username;
+				return cb(err);
+			}
 
-		console.log(chalk.green('Successfully created user'));
+			delete pass;
+			delete email;
+			delete username;
 
-		cb();
+			console.log(chalk.green('Successfully created user'));
+
+			cb();
+		});
 	});
 
 }