diff --git a/src/device/input/parse/v01/server.go b/src/device/input/parse/v01/server.go
index 42f30b8..ec7ce8c 100644
--- a/src/device/input/parse/v01/server.go
+++ b/src/device/input/parse/v01/server.go
@@ -84,8 +84,12 @@ func (v01 *V01) getUserFeedback(w http.ResponseWriter, r *http.Request) {
 		msg = v01.cfg.Broadcast.Message
 	}
 
-	if user.State.GM.Alias != "" {
-		msg = fmt.Sprintf("%s (Your secret word is '%s'. Make **someone else** say it!)", msg, user.State.GM.Alias)
+	alias := user.State.GM.Alias
+	if alias == "" {
+		alias = user.State.GM.LastAlias
+	}
+	if alias != "" {
+		msg = fmt.Sprintf("%s (Your secret word is '%s'. Make **someone else** say it!)", msg, alias)
 	}
 
 	w.Write([]byte(msg))
@@ -213,7 +217,6 @@ func (v01 *V01) serveGMSomeoneSaidAlias(w http.ResponseWriter, r *http.Request)
 	v01.cfg.Quiet = true
 	for k, v := range v01.cfg.Users {
 		v.State.GM.LastAlias = v.State.GM.Alias
-		v.State.Message = fmt.Sprintf("remember, you were %q", v.State.GM.LastAlias)
 		v.State.GM.Alias = ""
 		v01.cfg.Users[k] = v
 	}