diff --git a/app/scripts/controllers/login.coffee b/app/scripts/controllers/login.coffee
index c8103eb..9708361 100644
--- a/app/scripts/controllers/login.coffee
+++ b/app/scripts/controllers/login.coffee
@@ -37,8 +37,9 @@ angular.module('angularCmsApp').controller 'LoginCtrl', ($scope, $rootScope, $co
 				#Change location
 				$rootScope.App.location.path('/dashboard')
 			,
-			(error)->
-				cmsNotify( '.login-message', 'danger', 'Error!', error.message, 2500)
+			(err)->
+				console.error(err)
+				cmsNotify( '.login-message', 'danger', 'Error!', err.data.message, 2500)
 		)
 
 	###
diff --git a/app/scripts/controllers/register.coffee b/app/scripts/controllers/register.coffee
index 83b7dd9..327e38b 100644
--- a/app/scripts/controllers/register.coffee
+++ b/app/scripts/controllers/register.coffee
@@ -32,7 +32,7 @@ angular.module('angularCmsApp').controller 'RegisterCtrl', ($scope, $location, $
 
 					#Welcome the user
 					cmsNotify( '.message', 'info', 'Registered!', "You have registered as #{data.user.email}")
-					
+
 					#Set user session
 					session =
 						user: data.user
@@ -45,7 +45,7 @@ angular.module('angularCmsApp').controller 'RegisterCtrl', ($scope, $location, $
 					$location.path('/dashboard')
 				)
 			,
-			(error) ->
-				$log.error(error)
-				cmsNotify( '.message', 'danger', 'Error!', error.message, 4000)
+			(err) ->
+				$log.error(err)
+				cmsNotify( '.message', 'danger', 'Error!', err.data.message, 4000)
 		)
diff --git a/app/scripts/controllers/users.coffee b/app/scripts/controllers/users.coffee
index df2984b..a8a9f59 100644
--- a/app/scripts/controllers/users.coffee
+++ b/app/scripts/controllers/users.coffee
@@ -11,8 +11,8 @@ angular.module('angularCmsApp').controller('UsersCtrl', ($scope, DataService) ->
 			email: null
 			password: null
 			role: 'member'
-			created: new Date()
-			modified: new Date()
+			created_at: new Date()
+			updated_at: new Date()
 			metadata:
 				avatar: ''
 				name: null
@@ -44,7 +44,6 @@ angular.module('angularCmsApp').controller('UsersCtrl', ($scope, DataService) ->
 		#Delete user
 		$scope.deleteUser = (index, user) ->
 			ask = confirm "Delete #{user.email}?"
-
 			if ask
 				DataService.destroy('users', user).then((res) ->
 					$scope.users.pop(index)
@@ -53,7 +52,6 @@ angular.module('angularCmsApp').controller('UsersCtrl', ($scope, DataService) ->
 
 		#Add user to database
 		$scope.addUser = (user) ->
-			user.created_at = new Date()
 			user.updated_at = new Date()
 			DataService.save('users', user).then((data) ->
 				$scope.getUsers()
diff --git a/app/views/users.html b/app/views/users.html
index efed6e2..c61b92b 100755
--- a/app/views/users.html
+++ b/app/views/users.html
@@ -14,10 +14,10 @@ <h1><i class="fa fa-1x fa-group"></i> Users
 					<thead>
 					<tr>
 						<th class="tc"><input type="checkbox"></th>
+						<th>Username</th>
 						<th>E-mail</th>
-
 						<th>Active</th>
-						<th>Created</th>
+						<th>Last Updated</th>
 						<th class="actions">Actions</th>
 					</tr>
 					</thead>
@@ -26,13 +26,14 @@ <h1><i class="fa fa-1x fa-group"></i> Users
 						<td class="tc">
 							<input type="checkbox" value="{{user._id}}">
 						</td>
+						<td>{{ user.username }}</td>
 						<td> {{user.email}}
-							{{ user.username }}
+
 							<span class="label label-primary" ng-repeat="group in user.groups">{{group}}</span>
 						</td>
 
 						<td> {{user.active}}</td>
-						<td> {{user.created | date:'medium'}}</td>
+						<td> {{user.updated_at | date:'medium'}}</td>
 						<td class="actions">
 							<div class="btn-group">
 								<button type="button" class="btn btn-default btn-sm" ng-click="selectUser(user);" data-toggle="modal"
diff --git a/bower.json b/bower.json
index 1a23f3e..f92edb2 100755
--- a/bower.json
+++ b/bower.json
@@ -24,8 +24,5 @@
   },
   "devDependencies": {
     "angular-mocks": "~1.2.21"
-  },
-  "resolutions": {
-    "bootstrap": "~3.2.0"
   }
 }
diff --git a/config/config.json b/config/config.json
index ee1081f..e3f5c29 100644
--- a/config/config.json
+++ b/config/config.json
@@ -4,7 +4,7 @@
 	"apiBase": "/api/v2",
 	"version": "v2",
 	"security": {"salt": "angular-cms"},
-	"mongodb": "angularcms:angularcms@paulo.mongohq.com:10089/app19632340",
+	"mongodb": "localhost/angular-cms",
 	"db": {
 		"name": "angular-cms",
 		"username": "amadmin",
diff --git a/routes/cms-auth.js b/routes/cms-auth.js
index b9856f2..cce6fe2 100644
--- a/routes/cms-auth.js
+++ b/routes/cms-auth.js
@@ -1,21 +1,25 @@
 var bodyParser = require( 'body-parser' ),
 	mongoose = require( 'mongoose' ),
+	util = require('util'),
 	User = require( './models/user' ),
 	session = require( 'express-session' ),
 	crypto = require( 'crypto' );
 
+var bcrypt = require( 'bcrypt-nodejs' );
+
+
+
 module.exports = function (config, app) {
 	console.warn( 'cms-auth' );
 
 	mongoose.connect( config.mongodb );
 
-//### hashPassword
-//Hash password using basic sha1 hash.
-	var hashPassword = function (pass) {
-		var shasum = crypto.createHash( 'sha1' );
-		shasum.update( config.security.salt + pass );
+	//### hashPassword
+	//Hash password using basic sha1 hash.
+	var hashPassword = function (pass, salt) {
+		var p = bcrypt.hashSync(pass);
 
-		return shasum.digest( 'hex' );
+		return p;
 	};
 
 	var cmsAuth = {
@@ -38,15 +42,16 @@ module.exports = function (config, app) {
 			}
 
 			//TODO: Hashing on client side
-			query.password = hashPassword( req.body.password );
+			query.password = hashPassword( req.body.password, query.username );
 
 			console.warn( 'Login Query: ' + JSON.stringify( query ) + ''.verbose );
 
-			User.findOne( query, function (err, data) {
+			User.findOne( {username: query.username}, function (err, data) {
 				if (err) {
 					res.jsonp( 400, err );
 				}
 				if (data) {
+					console.warn('found user', util.inspect(data, {colors: true}));
 					res.jsonp( 200, data );
 				} else {
 					res.jsonp( 404, {message: 'Wrong username/password!'} );
@@ -72,28 +77,33 @@ module.exports = function (config, app) {
 			}
 
 			//TODO: Hashing on client side
-			data.password = hashPassword( req.body.password );
+			data.password = hashPassword( req.body.password, data.username );
 
-			console.log( String( "Register user" ).debug, data );
+			data.created_at = new Date();
+			data.updated_at = new Date();
+			data.active = false;
+			data.groups = ['public'];
 
 			var user = new User( data );
 
 			//Try and find user
-			User.find( data, function (err, u) {
-				console.log(err, u);
-				if (u) {
-					res.json( 400, {message: 'Username already exists!'} );
-				}
-			} );
-
-			user.save( function (err, ok) {
-				if (err) {
+			User.find( {username: data.username}, function (err, u) {
+				console.log(err, util.inspect(u, {colors: true}));
+				if(err){
 					res.json( 400, {message: 'Problem registering!'} );
+				}
+				if (u.length > 0) {
+					res.json( 400, {message: 'Username already exists!'} );
 				} else {
-					res.json( 200, ok );
+					user.save( function (er, ok) {
+						if (er) {
+							res.json( 400, {message: 'Problem registering!'} );
+						} else {
+							res.json( 201, ok );
+						}
+					} );
 				}
 			} );
-
 		},
 		session: function (req, res, next) {
 		}
diff --git a/routes/cms-sockets.js b/routes/cms-sockets.js
index 6f5e779..894fc91 100644
--- a/routes/cms-sockets.js
+++ b/routes/cms-sockets.js
@@ -1,3 +1,11 @@
-module.exports = function (config, app) {
+const events = require('events'), util = require('util');
+
+var cmsSockets = function (config, app) {
+	events.EventEmitter.call(this);
+
 	console.warn( 'cms-sockts' );
+
 };
+
+util.inherits(cmsSockets, events.EventEmitter);
+module.exports = cmsSockets;
diff --git a/routes/models/user.js b/routes/models/user.js
index be18d5b..f40eb34 100644
--- a/routes/models/user.js
+++ b/routes/models/user.js
@@ -2,6 +2,7 @@
 // load the things we need
 var mongoose = require( 'mongoose' );
 var bcrypt = require( 'bcrypt-nodejs' );
+var hash = bcrypt.hashSync("bacon");
 
 // define the schema for our user model
 var UserSchema = mongoose.Schema( {
@@ -84,4 +85,4 @@ UserSchema.method( 'findByEmail', function (email, fn) {
 } );
 
 // create the model for users and expose it to our app
-module.exports = mongoose.model( 'User', UserSchema );
\ No newline at end of file
+module.exports = mongoose.model( 'User', UserSchema );
diff --git a/routes/rest.js b/routes/rest.js
index 62820ac..a6b68b3 100755
--- a/routes/rest.js
+++ b/routes/rest.js
@@ -41,8 +41,8 @@ var MESSAGES = {
 };
 var DS = require('jps-ds').DS;
 var _ds = new DS({
-	host: 'angularcms:angularcms@paulo.mongohq.com:10089/app19632340',
-	//host: 'localhost:27017/angular-cms',
+	//host: 'angularcms:angularcms@paulo.mongohq.com:10089/app19632340',
+	host: 'localhost/angular-cms',
 	models: {
 		'groups': {
 			title: String,
diff --git a/test/routes/rest-spec.js b/test/routes/rest-spec.js
index 804d678..5e617c0 100644
--- a/test/routes/rest-spec.js
+++ b/test/routes/rest-spec.js
@@ -16,14 +16,13 @@ cmsRoutes.mount(config, app);
 app.listen(9292);
 
 var endpoint = 'http://localhost:8181/api/v2';
+var username =  "nodetest" + Date.now();
 var postData = {
-	"username": "nodetest" + Date.now(),
-	"email": "nodetest@email.com",
+	"username": username,
+	"email": username + "@email.com",
 	"password": "test",
 	"active": true,
 	"groups": ["member"],
-	"created": new Date(),
-	"modified": new Date(),
 	"metadata": {
 		"avatar": "",
 		"name": "Node Test User"
@@ -44,7 +43,7 @@ describe('Testing: API Server', function () {
 
 	it('POST - /api/v2/users/login - should return user on successful login', function (done) {
 		var validUser = {
-			username: 'nodetest',
+			username: 'test@email.com',
 			password: 'test'
 		};
 		request(app)