diff --git a/src/apps/people/PeopleApp.cpp b/src/apps/people/PeopleApp.cpp
index b36b56694c..7ff6e30ead 100644
--- a/src/apps/people/PeopleApp.cpp
+++ b/src/apps/people/PeopleApp.cpp
@@ -167,10 +167,14 @@ TPeopleApp::ArgvReceived(int32 argc, char **argv)
 		if (gFields[index].attribute != NULL) {
 			if (!window)
 				window = NewWindow();
-			while (*arg != ' ')
+
+			while (arg[0] && arg[0] != ' ' && arg[0] != '=')
 				arg++;
-			arg++;
-			window->SetField(index, arg);
+
+			if (arg[0]) {
+				arg++;
+				window->SetField(index, arg);
+			}
 		}
 	}
 }