2 files changed, 6 insertions, 14 deletions

diff --git a/web/react/utils/emoticons.jsx b/web/react/utils/emoticons.jsx
index 7210201ff..a7c837199 100644
--- a/web/react/utils/emoticons.jsx
+++ b/web/react/utils/emoticons.jsx
@@ -5,15 +5,14 @@ const emoticonPatterns = {
     smile: /:-?\)/g, // :)
     open_mouth: /:o/gi, // :o
     scream: /:-o/gi, // :-o
-    smirk: /[:;]-?]/g, // :]
-    grinning: /[:;]-?d/gi, // :D
+    smirk: /:-?]/g, // :]
+    grinning: /:-?d/gi, // :D
     stuck_out_tongue_closed_eyes: /x-d/gi, // x-d
-    stuck_out_tongue_winking_eye: /[:;]-?p/gi, // ;p
+    stuck_out_tongue_winking_eye: /:-?p/gi, // :p
     rage: /:-?[\[@]/g, // :@
     frowning: /:-?\(/g, // :(
     sob: /:['’]-?\(|:'\(/g, // :`(
     kissing_heart: /:-?\*/g, // :*
-    wink: /;-?\)/g, // ;)
     pensive: /:-?\//g, // :/
     confounded: /:-?s/gi, // :s
     flushed: /:-?\|/g, // :|
diff --git a/web/web.go b/web/web.go
index 3b36f3d56..1e435d47f 100644
--- a/web/web.go
+++ b/web/web.go
@@ -145,14 +145,8 @@ func root(c *api.Context, w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	if len(c.Session.UserId) == 0 {
-		page := NewHtmlTemplatePage("signup_team", "Signup")
-		page.Render(c, w)
-	} else {
-		page := NewHtmlTemplatePage("home", "Home")
-		page.Props["TeamURL"] = c.GetTeamURL()
-		page.Render(c, w)
-	}
+	page := NewHtmlTemplatePage("signup_team", "Signup")
+	page.Render(c, w)
 }
 
 func signup(c *api.Context, w http.ResponseWriter, r *http.Request) {
@@ -175,8 +169,7 @@ func login(c *api.Context, w http.ResponseWriter, r *http.Request) {
 	var team *model.Team
 	if tResult := <-api.Srv.Store.Team().GetByName(teamName); tResult.Err != nil {
 		l4g.Error("Couldn't find team name=%v, teamURL=%v, err=%v", teamName, c.GetTeamURL(), tResult.Err.Message)
-		// This should probably do somthing nicer
-		http.Redirect(w, r, "http://"+r.Host, http.StatusTemporaryRedirect)
+		http.Redirect(w, r, api.GetProtocol(r)+"://"+r.Host, http.StatusTemporaryRedirect)
 		return
 	} else {
 		team = tResult.Data.(*model.Team)