diff --git a/src/command.c b/src/command.c
index 3606ad3b..d80d58c5 100644
--- a/src/command.c
+++ b/src/command.c
@@ -252,7 +252,7 @@ static struct cmd_t main_commands[] =
           NULL } } },
 
     { "/info",
-        _cmd_info, parse_args, 1, 1,
+        _cmd_info, parse_args_with_freetext, 1, 1,
         { "/info jid", "Find out a contacts presence information.",
         { "/info jid",
           "---------",
diff --git a/src/windows.c b/src/windows.c
index 28b63c74..a4b12917 100644
--- a/src/windows.c
+++ b/src/windows.c
@@ -1168,7 +1168,7 @@ cons_show_status(const char * const contact)
     if (pcontact != NULL) {
         _cons_show_contact(pcontact);
     } else {
-        cons_show("No such contact %s in roster.", contact);
+        cons_show("No such contact \"%s\" in roster.", contact);
     }
 }