diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js
index 6e8e651d19..5e25ce5c78 100644
--- a/public/src/ajaxify.js
+++ b/public/src/ajaxify.js
@@ -118,7 +118,8 @@ var ajaxify = {};
 			}
 
 			head.insertBefore(script, head.firstChild);
-			head.removeChild(script);
+			//TODO: remove from head before inserting?, doing this breaks scripts in safari so commented out for now
+			//head.removeChild(script);
 		};
 
 		var scripts = [],
diff --git a/public/src/forum/login.js b/public/src/forum/login.js
index 6e83c0b9f2..12370b0ef0 100644
--- a/public/src/forum/login.js
+++ b/public/src/forum/login.js
@@ -1,3 +1,5 @@
+
+
 (function() {
 	// Alternate Logins
 	var altLoginEl = document.querySelector('.alt-logins');
@@ -12,7 +14,6 @@
 		}
 	});	
 	
-	
 	$('#login').on('click', function() {
 		
 		var loginData = {
@@ -32,9 +33,11 @@
 			error : function(data, textStatus, jqXHR) {
 				$('#login-error-notify').show().delay(1000).fadeOut(250);
 			},
-			dataType: 'json'
+			dataType: 'json',
+			async: true,
+			timeout: 2000
 		});
-		
+
 		return false;
 	});
 	
diff --git a/public/templates/login.tpl b/public/templates/login.tpl
index 4cf156f7a6..6f20aa4923 100644
--- a/public/templates/login.tpl
+++ b/public/templates/login.tpl
@@ -7,12 +7,12 @@
 			<strong>Failed Login Attempt</strong> <p></p>
 		</div>
 		
-		<form>
+		<div>
 			<label>Username</label><input type="text" placeholder="Enter Username" name="username" id="username" /><br />
 			<label>Password</label><input type="password" placeholder="Enter Password" name="password" id="password" /><br />
 			<input type="hidden" name="_csrf" value="{token}" id="csrf-token" />
 			<button class="btn btn-primary" id="login" type="submit">Login</button> &nbsp; <a href="/reset">Forgot Password?</a>
-		</form>
+		</div>
 		
 		<span id="login-error-notify" class="label label-important hide">Invalid username/password</span><br/>
 	</div>
diff --git a/src/user.js b/src/user.js
index de561ca4f9..2d26c535cd 100644
--- a/src/user.js
+++ b/src/user.js
@@ -255,10 +255,22 @@ var utils = require('./../public/src/utils.js'),
 
 	User.search = function(username, callback) {
 		console.log('searching '+username);
-		RDB.keys('username:'+ username + '*:uid', function(err, data) {
+		RDB.keys('username:'+ username + '*:uid', function(err, keys) {
 			if(err === null) {
-				console.log(data);
-				callback(data);
+				//console.log(data);
+				
+				/*var keys = [];
+				for(var i=0, ii=data.length; i<ii; ++i) {
+					keys.push('')
+				}*/
+
+				RDB.mget(keys, function(err, uids) {
+					console.log(uids);
+					User.getDataForUsers(uids, function(userdata) {
+						callback(userdata);
+					});
+				});
+			
 			}	
 			else
 				console.log(err);