diff --git a/public/js/wn/form/workflow.js b/public/js/wn/form/workflow.js
index 05db3694cd..7a586ba41d 100644
--- a/public/js/wn/form/workflow.js
+++ b/public/js/wn/form/workflow.js
@@ -81,20 +81,22 @@ wn.ui.form.States = Class.extend({
 			
 			var state_doc = wn.model.get("Workflow State", {name:state})[0];
 
-			// set the icon
-			this.workflow_button.find('i').removeClass()
-				.addClass("icon-white")
-				.addClass("icon-" + state_doc.icon);
+			if (state_doc) {
+				// set the icon
+				this.workflow_button.find('i').removeClass()
+					.addClass("icon-white")
+					.addClass("icon-" + state_doc.icon);
 
-			// set the style
-			this.workflow_button.removeClass().addClass("btn btn-default dropdown-toggle")
+				// set the style
+				this.workflow_button.removeClass().addClass("btn btn-default dropdown-toggle")
+
+				if(state_doc && state_doc.style)
+					this.workflow_button.addClass("btn-" + state_doc.style.toLowerCase());
+			}
 
-			if(state_doc && state_doc.style)
-				this.workflow_button.addClass("btn-" + state_doc.style.toLowerCase());
-			
 			// show actions from that state
 			this.show_actions(state);
-			
+
 			if(this.frm.doc.__islocal) {
 				this.workflow_button.prop('disabled', true);
 			}
diff --git a/webnotes/auth.py b/webnotes/auth.py
index 2dc237cb64..4ebeefc214 100644
--- a/webnotes/auth.py
+++ b/webnotes/auth.py
@@ -113,7 +113,6 @@ class LoginManager:
 			webnotes._response.set_cookie("full_name", full_name)
 			webnotes._response.set_cookie("user_id", self.user)
 
-	
 	def post_login(self):
 		self.run_trigger()
 		self.validate_ip_address()