diff --git a/modules/auth/user.go b/modules/auth/user.go
index 215cffedb0..4059edfdd3 100644
--- a/modules/auth/user.go
+++ b/modules/auth/user.go
@@ -20,6 +20,9 @@ func SignedInId(session sessions.Session) int64 {
 		return 0
 	}
 	if s, ok := userId.(int64); ok {
+		if _, err := models.GetUserById(s); err != nil {
+			return 0
+		}
 		return s
 	}
 	return 0
diff --git a/templates/user/signup.tmpl b/templates/user/signup.tmpl
index cfbf27fd93..ba41b0c9bb 100644
--- a/templates/user/signup.tmpl
+++ b/templates/user/signup.tmpl
@@ -7,7 +7,7 @@
 		<div class="form-group {{if .Err_UserName}}has-error has-feedback{{end}}">
 			<label class="col-md-4 control-label">Username: </label>
 			<div class="col-md-6">
-				<input name="username" class="form-control" placeholder="Type your username" value="{{.username}}" required="required" title="Username must contain at least has 5 characters">
+				<input name="username" class="form-control" placeholder="Type your username" value="{{.username}}" required="required" title="Username must contain at least 5 characters">
 			</div>
 		</div>
 
@@ -21,7 +21,7 @@
 		<div class="form-group {{if .Err_Password}}has-error has-feedback{{end}}">
 			<label class="col-md-4 control-label">Password: </label>
 			<div class="col-md-6">
-				<input name="passwd" type="password" class="form-control" placeholder="Type your password" required="required" title="Password must contain at least has 6 characters">
+				<input name="passwd" type="password" class="form-control" placeholder="Type your password" required="required" title="Password must contain at least 6 characters">
 			</div>
 		</div>