diff --git a/NadekoBot/Commands/ServerGreetCommand.cs b/NadekoBot/Commands/ServerGreetCommand.cs
index 5d8ea590..bb91c93d 100644
--- a/NadekoBot/Commands/ServerGreetCommand.cs
+++ b/NadekoBot/Commands/ServerGreetCommand.cs
@@ -197,6 +197,8 @@ namespace NadekoBot.Commands {
 
                     AnnouncementsDictionary[e.Server.Id].GreetText = e.GetArg("msg");
                     await e.Send("New greet message set.");
+                    if (!AnnouncementsDictionary[e.Server.Id].Greet)
+                        await e.Send("Enable greet messsages by typing `.greet`");
                 });
 
             cgb.CreateCommand(".bye")
@@ -225,6 +227,8 @@ namespace NadekoBot.Commands {
 
                     AnnouncementsDictionary[e.Server.Id].ByeText = e.GetArg("msg");
                     await e.Send("New bye message set.");
+                    if (!AnnouncementsDictionary[e.Server.Id].Bye)
+                        await e.Send("Enable bye messsages by typing `.bye`");
                 });
         }
     }
diff --git a/NadekoBot/Modules/Administration.cs b/NadekoBot/Modules/Administration.cs
index 5a3e60ee..85e37cf0 100644
--- a/NadekoBot/Modules/Administration.cs
+++ b/NadekoBot/Modules/Administration.cs
@@ -315,9 +315,9 @@ namespace NadekoBot.Modules
 					
 		      cgb.CreateCommand(".setgame")
                 .Description("Sets the bots game.")
-                .Parameter("set_game", ParameterType.Required)
+                .Parameter("set_game", ParameterType.Unparsed)
                 .Do(e => {
-                    if (e.User.Id != NadekoBot.OwnerID) return;
+                    if (e.User.Id != NadekoBot.OwnerID || e.GetArg("set_game") != null) return;
 
                     client.SetGame(e.GetArg("set_game"));
                 });