diff --git a/src/command/commands.c b/src/command/commands.c
index 6e8ccfd9..a58b8397 100644
--- a/src/command/commands.c
+++ b/src/command/commands.c
@@ -3271,6 +3271,10 @@ cmd_disco(ProfWin *window, const char * const command, gchar **args)
 gboolean
 cmd_lastactivity(ProfWin *window, const char * const command, gchar **args)
 {
+    if ((g_strcmp0(args[0], "on") == 0) || (g_strcmp0(args[0], "off") == 0)) {
+        return _cmd_set_boolean_preference(args[0], command, "Last activity", PREF_LASTACTIVITY);
+    }
+
     jabber_conn_status_t conn_status = jabber_get_connection_status();
 
     if (conn_status != JABBER_CONNECTED) {
@@ -3288,10 +3292,6 @@ cmd_lastactivity(ProfWin *window, const char * const command, gchar **args)
         jid_destroy(jidp);
 
         return TRUE;
-
-    } else if ((g_strcmp0(args[0], "on") == 0) || (g_strcmp0(args[0], "off") == 0)) {
-        return _cmd_set_boolean_preference(args[0], command, "Last activity responses", PREF_LASTACTIVITY);
-
     } else {
         iq_last_activity_request(args[0]);
         return TRUE;