diff --git a/public/src/templates.js b/public/src/templates.js
index f18b1e50b6..e038161d50 100644
--- a/public/src/templates.js
+++ b/public/src/templates.js
@@ -41,7 +41,7 @@ var templates = {};
 	function init() {
 		loadTemplates([
 				'header', 'footer', 'register', 'home', 'topic',
-				'login', 'reset', 'reset_code', 'account_settings',
+				'login', 'reset', 'reset_code',
 				'emails/reset', 'emails/reset_plaintext'
 			]);
 	}
diff --git a/public/templates/register.tpl b/public/templates/register.tpl
index 60988336d3..f7ed2e9c4d 100644
--- a/public/templates/register.tpl
+++ b/public/templates/register.tpl
@@ -2,10 +2,12 @@
 
 <h1>Register</h1>
 <div class="well">
-	<label for="email">Email Address</label><input type="email" placeholder="Enter Email Address" id="email" /> <span id="email-notify" class="label label-important"></span> <br />
-	<label for="username">Username</label><input type="text" placeholder="Enter Username" id="username" /> <span id="username-notify" class="label label-success"></span> <br />
-	<label for="password">Password</label><input type="password" placeholder="Enter Password" id="password" /><br />
-	<button class="btn btn-primary" id="register" type="submit">Register Now</button>
+	<form method="post" action="/register">
+		<label for="email">Email Address</label><input type="email" name="email" placeholder="Enter Email Address" id="email" /> <span id="email-notify" class="label label-important"></span> <br />
+		<label for="username">Username</label><input type="text" name="username" placeholder="Enter Username" id="username" /> <span id="username-notify" class="label label-success"></span> <br />
+		<label for="password">Password</label><input type="password" name="password" placeholder="Enter Password" id="password" /><br />
+		<button class="btn btn-primary" id="register" type="submit">Register Now</button>
+	</form>
 </div>
 <script type="text/javascript">
 (function() {
@@ -16,14 +18,6 @@
 		username_notify = document.getElementById('username-notify'),
 		email_notify = document.getElementById('email-notify');
 
-	register.onclick = function() {
-		socket.emit('user.create', {
-			username: username.value,
-			password: password.value,
-			email: emailEl.value
-		});
-	};
-
 	username.onkeyup = function() {
 		if (username.value.length > 2) socket.emit('user.exists', {username: username.value});
 		else {
@@ -32,20 +26,11 @@
 		}
 	}
 	emailEl.addEventListener('change', function() {
-		console.log('checking email existance');
 		socket.emit('user.email.exists', { email: emailEl.value });
 	}, false);
 
+	ajaxify.register_events(['user.exists', 'user.email.exists']);
 
-
-
-	ajaxify.register_events(['user.create', 'user.exists', 'user.email.exists']);
-
-	socket.on('user.create', function(data) {
-		//console.log('user create: ' + data.status);
-		ajaxify.go('/');
-		
-	});
 	socket.on('user.exists', function(data) {
 		if (data.exists == true) {
 			username_notify.innerHTML = 'Username exists';
diff --git a/src/user.js b/src/user.js
index 1610352477..c0161db737 100644
--- a/src/user.js
+++ b/src/user.js
@@ -133,15 +133,10 @@ var	config = require('../config.js'),
 		});
 	}
 
-	User.create = function(username, password, email) {
-		if (username == null || password == null) {
-			return; socket.emit('user.create', {'status': 0, 'message': 'Missing fields'});
-		}
-
-
+	User.create = function(username, password, email, callback) {
 		User.exists(username, function(exists) {
 			if (exists) {
-				return;
+				return callback('user-exists', 0);
 			}
 
 			RDB.incr('global:next_user_id', function(uid) {
@@ -158,14 +153,7 @@ var	config = require('../config.js'),
 				RDB.lpush('user:users', username);
 				io.sockets.emit('user.latest', {username: username});
 
-				socket.emit('user.create', {'status': 1});
-
-				socket.emit('event:alert', {
-					title: 'Thank you for registering',
-					message: 'You have successfully registered - welcome to nodebb!',
-					type: 'notify',
-					timeout: 2000
-				});
+				callback(null, uid);
 			});
 		});
 	};
@@ -174,11 +162,9 @@ var	config = require('../config.js'),
 	User.exists = function(username, callback) {
 		User.get_uid_by_username(username, function(exists) {
 			exists = !!exists;
-			socket.emit('user.exists', {exists: exists})
 
-			if (callback) {
-				callback(exists);
-			}
+			if (callback) callback(exists);
+			else socket.emit('user.exists', {exists: exists});
 		});
 	};
 	User.count = function() {
diff --git a/src/webserver.js b/src/webserver.js
index ea39bade42..32869b2bc1 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -164,6 +164,20 @@ passport.deserializeUser(function(uid, done) {
 		res.send(templates['header'] + templates['register'] + templates['footer']);
 	});
 
+	app.post('/register', function(req, res) {
+		global.modules.user.create(req.body.username, req.body.password, req.body.email, function(err, uid) {
+			if (err === null) {
+				req.login({
+					uid: uid
+				}, function() {
+					res.redirect('/');
+				});
+			} else {
+				res.redirect('/register');
+			}
+		});
+	});
+
 	app.get('/account', function(req, res) {
 		refreshTemplates();
 		res.send(templates['header'] + templates['account_settings'] + templates['footer']);
diff --git a/src/websockets.js b/src/websockets.js
index 832d07964c..b47277af36 100644
--- a/src/websockets.js
+++ b/src/websockets.js
@@ -53,10 +53,6 @@ var	SocketIO = require('socket.io').listen(global.server),
 			modules.user.get(uid, data.fields);
 		});
 
-		socket.on('user.create', function(data) {
-			modules.user.create(data.username, data.password, data.email);
-		});
-
 		socket.on('user.exists', function(data) {
 			modules.user.exists(data.username);
 		});