Merge branch 'master' of github.com:designcreateplay/NodeBB

public/src/ajaxify.js

@@ -117,6 +117,7 @@ var ajaxify = {};
 			if (hrefEmpty(this.href) || this.target !== '' || this.protocol === 'javascript:')
 				return;
 
+			if(!window.location.pathname.match(/\/(403|404)$/g))
 				app.previousUrl = window.location.href;
 
 			if (!e.ctrlKey && e.which === 1) {

public/src/forum/login.js

@@ -35,6 +35,9 @@ define(function() {
 						$('#login-error-notify').show();
 					} else {
 						$('#login-error-notify').hide();
+
+						if(!app.previousUrl) { app.previousUrl = '/'; }
+
 						if(app.previousUrl.indexOf('/reset/') != -1)
 							window.location.replace(RELATIVE_PATH + "/?loggedin");
 						else