diff --git a/public/js/legacy/widgets/form/fields.js b/public/js/legacy/widgets/form/fields.js
index 1b47811955..709d504b3a 100644
--- a/public/js/legacy/widgets/form/fields.js
+++ b/public/js/legacy/widgets/form/fields.js
@@ -288,6 +288,7 @@ DataField.prototype.make_input = function() {
 		if(val==null)val='';
 		me.input.value = val; 
 		if(me.format_input)me.format_input();
+		me.last_value = val;
 	}
 }
 DataField.prototype.validate = function(v) {
@@ -388,6 +389,7 @@ LinkField.prototype.make_input = function() {
 	me.input.set_input = function(val) {
 		if(val==undefined)val='';
 		me.txt.value = val;
+		me.last_value = val;
 	}
 
 	me.get_value = function() { return me.txt.value; }
@@ -729,6 +731,7 @@ CheckField.prototype.make_input = function() { var me = this;
 	
 	this.input.set_input = function(v) {
 		me.input.checked = cint(v) ? true : false;
+		me.last_value = v;
 	}
 
 	this.get_value= function() {
@@ -762,6 +765,7 @@ TextField.prototype.make_input = function() {
 	}
 	this.input.set_input = function(v) {
 		me.input.value = (v==null ? "" : v);
+		me.last_value = v;
 	}
 	this.input.onchange = function() {
 		me.set(me.input.value); 
@@ -911,6 +915,7 @@ SelectField.prototype.make_input = function() {
 			}
 			if(option === value) {
 				me.input.value = value;
+				me.last_value = value;
 				break;
 			}
 		}
@@ -999,6 +1004,7 @@ TimeField.prototype.make_input = function() {
 	
 	this.input.set_input = function(v) {
 		$(me.input).val(v);
+		me.last_value = v;
 	};
 	
 	this.input.onchange = function() {
diff --git a/public/js/wn/form/control.js b/public/js/wn/form/control.js
index 4702db1f30..3aa32369c5 100644
--- a/public/js/wn/form/control.js
+++ b/public/js/wn/form/control.js
@@ -739,9 +739,12 @@ wn.ui.form.ControlCode = wn.ui.form.ControlInput.extend({
 			field: this
 		});
 		this.has_input = true;
-		this.editor.$editor.keypress("ctrl+s meta+s", function() {
-			me.frm.save_or_update();
-		})
+		
+		if(this.editor.$editor) {
+			this.editor.$editor.keypress("ctrl+s meta+s", function() {
+				me.frm.save_or_update();
+			});
+		}
 	},
 	get_value: function() {
 		return this.editor.get_value();
diff --git a/templates/js/login.js b/templates/js/login.js
index 2bd24bffa9..580674d005 100644
--- a/templates/js/login.js
+++ b/templates/js/login.js
@@ -1,8 +1,10 @@
-
+var disable_signup = {{ disable_signup and "true" or "false" }};
 var login = {};
 
 $(document).ready(function(wrapper) {
-	$('#login_btn').click(login.do_login)
+	login.show_login();
+	
+	$('#login_btn').click(login.do_login);
 		
 	$('#password').keypress(function(ev){
 		if(ev.which==13 && $('#password').val()) {
@@ -62,7 +64,12 @@ login.do_login = function(){
 			if(data.message=="Logged In") {
 				window.location.href = "app.html";
 			} else if(data.message=="No App") {
-				window.location.href = get_url_arg("from") || "index";
+				if(localStorage) {
+					window.location.href = localStorage.getItem("last_visited") || "index";
+					localStorage.removeItem("last_visited");
+				} else {
+					window.location.href = "index";
+				}
 			} else {
 				login.set_message(data.message);
 			}
@@ -72,22 +79,40 @@ login.do_login = function(){
 	return false;
 }
 
-login.sign_up = function() {
+login.show_login = function() {
+	$("#login_wrapper h3").html("Login");
+	$("#login-label").html("Email Id");
+	$("#password-row").toggle(true);
+	$("#full-name-row, #login_message").toggle(false);
+	$("#login_btn").html("Login").removeClass("btn-success");
+	$("#switch-view").html('<a style="margin-left: -35px;" \
+		onclick="return login.show_forgot_password()">Forgot Password?</a>');
+	
+	if(!disable_signup) {
+		$("#switch-view").append('<hr><div>\
+			New User? <button class="btn btn-success" style="margin-left: 10px; margin-top: -2px;"\
+				onclick="return login.show_sign_up()">Sign Up</button></div>');
+	}
+
+	window.is_login = true;
+}
+
+login.show_sign_up = function() {
 	$("#login_wrapper h3").html("Sign Up");
 	$("#login-label").html("Email Id");
-	$("#password-row, #sign-up-wrapper, #login_message").toggle(false);
+	$("#password-row, #login_message").toggle(false);
 	$("#full-name-row").toggle(true);
-	$("#login_btn").html("Register");
-	$("#forgot-wrapper").html("<a onclick='location.reload()' href='#'>Login</a>")
+	$("#login_btn").html("Sign Up").addClass("btn-success");
+	$("#switch-view").html("<a onclick='return login.show_login()' href='#'>Login</a>");
 	window.is_sign_up = true;
 }
 
 login.show_forgot_password = function() {
 	$("#login_wrapper h3").html("Forgot");
 	$("#login-label").html("Email Id");
-	$("#password-row, #sign-up-wrapper, #login_message").toggle(false);
-	$("#login_btn").html("Send Password");
-	$("#forgot-wrapper").html("<a onclick='location.reload()' href='#'>Login</a>")
+	$("#password-row, #login_message, #full-name-row").toggle(false);
+	$("#login_btn").html("Send Password").removeClass("btn-success");
+	$("#switch-view").html("<a onclick='return login.show_login()' href='#'>Login</a>");
 	window.is_forgot = true;
 }
 
diff --git a/templates/pages/login.html b/templates/pages/login.html
index bc748fe4f8..66b3c6e3a0 100644
--- a/templates/pages/login.html
+++ b/templates/pages/login.html
@@ -34,7 +34,7 @@
 							<td>&nbsp;</td>
 							<td>
 								<button type="submit" id="login_btn" 
-									class="btn btn-small btn-primary">Login</button>
+									class="btn btn-primary">Login</button>
 								<img src="lib/images/ui/button-load.gif" id="login-spinner" 
 									style="display: none;">
 							</td>
@@ -43,15 +43,8 @@
 				</table>
 			</form>
 			<br>
-			<p style="text-align: center" id="forgot-wrapper">
-				<a id="forgot-password" style="cursor:pointer"
-				onclick="return login.show_forgot_password()">Forgot Password</a></p>
 			
-			{% if not disable_signup %}
-			<p style="text-align: center" id="sign-up-wrapper">
-				New user? <a id="sign-up" style="cursor:pointer"
-				onclick="return login.sign_up()">Sign Up</a></p>
-			{% endif %}
+			<p style="text-align: center" id="switch-view"></p>
 		</div>
 	</div>
 	<div class="web-footer login-footer container">
diff --git a/webnotes/modules/import_file.py b/webnotes/modules/import_file.py
index e460a990f8..6cadd9e03c 100644
--- a/webnotes/modules/import_file.py
+++ b/webnotes/modules/import_file.py
@@ -86,7 +86,7 @@ def import_doclist(doclist):
 			old_doc = webnotes.doc(doctype, name)
 
 	# delete old
-	webnotes.delete_doc(doctype, name, force=1, ignore_doctypes =ignore, for_reload=True)
+	webnotes.delete_doc(doctype, name, force=1, ignore_doctypes=ignore, for_reload=True)
 	
 	# don't overwrite ignored docs
 	doclist1 = remove_ignored_docs_if_they_already_exist(doclist, ignore, name)
@@ -100,6 +100,7 @@ def import_doclist(doclist):
 	new_bean.ignore_children_type = ignore
 	new_bean.ignore_check_links = True
 	new_bean.ignore_validate = True
+	new_bean.ignore_permissions = True
 	
 	if doctype=="DocType" and name in ["DocField", "DocType"]:
 		new_bean.ignore_fields = True