diff --git a/public/src/templates.js b/public/src/templates.js
index 82c0438b05..07d6c8fc7a 100644
--- a/public/src/templates.js
+++ b/public/src/templates.js
@@ -156,6 +156,10 @@
 			template_data = data;
 			parse_template();
 		}).fail(function (data) {
+			if(data && data.status == 404) {
+				ajaxify.go('404');
+				return;
+			}
 			app.alertError("Can't load template data!");
 		});
 
diff --git a/src/user.js b/src/user.js
index 4c6ccfc811..2bd216725f 100644
--- a/src/user.js
+++ b/src/user.js
@@ -227,7 +227,7 @@ var utils = require('./../public/src/utils.js'),
 		});
 
 		function updateField(field, next) {
-			if (data[field] !== undefined) {
+			if (data[field] !== undefined && typeof data[field] === 'string') {
 				if (field === 'email') {
 					var gravatarpicture = User.createGravatarURLFromEmail(data[field]);
 					User.setUserField(uid, 'gravatarpicture', gravatarpicture);