diff --git a/src/web/app/common/tags/signin.tag b/src/web/app/common/tags/signin.tag
index 5f400d9bd..d181e7162 100644
--- a/src/web/app/common/tags/signin.tag
+++ b/src/web/app/common/tags/signin.tag
@@ -113,6 +113,13 @@
 		@onsubmit = (e) ~>
 			e.prevent-default!
 
+			if @refs.username.value == ''
+				@refs.username.focus!
+				return false
+			if @refs.password.value == ''
+				@refs.password.focus!
+				return false
+
 			@signing = true
 			@update!