diff --git a/client.c b/client.c
index 214ec6a0..e7118a3b 100644
--- a/client.c
+++ b/client.c
@@ -216,32 +216,33 @@ out:
 	 * Print exit status message, unless running as a login shell where it
 	 * would either be pointless or irritating.
 	 */
-	if (!login_shell) {
-		if (sigterm) {
-			printf("[terminated]\n");
-			return (1);
-		}
-		switch (cctx->exittype) {
-		case CCTX_DIED:
-			printf("[lost server]\n");
-			return (0);
-		case CCTX_SHUTDOWN:
+	if (sigterm) {
+		printf("[terminated]\n");
+		return (1);
+	}
+	switch (cctx->exittype) {
+	case CCTX_DIED:
+		printf("[lost server]\n");
+		return (0);
+	case CCTX_SHUTDOWN:
+ 		if (!login_shell)
 			printf("[server exited]\n");
-			return (0);
-		case CCTX_EXIT:
-			if (cctx->errstr != NULL) {
-				printf("[error: %s]\n", cctx->errstr);
-				return (1);
-			}
-			printf("[exited]\n");
-			return (0);
-		case CCTX_DETACH:
-			printf("[detached]\n");
-			return (0);
-		default:
-			printf("[unknown error]\n");
+		return (0);
+	case CCTX_EXIT:
+		if (cctx->errstr != NULL) {
+			printf("[error: %s]\n", cctx->errstr);
 			return (1);
 		}
+ 		if (!login_shell)
+			printf("[exited]\n");
+		return (0);
+	case CCTX_DETACH:
+		if (!login_shell)
+			printf("[detached]\n");
+		return (0);
+	default:
+		printf("[unknown error]\n");
+		return (1);
 	}
 }
 
diff --git a/cmd-server-info.c b/cmd-server-info.c
index 48ea3707..7ad7bdd6 100644
--- a/cmd-server-info.c
+++ b/cmd-server-info.c
@@ -68,9 +68,8 @@ cmd_server_info_exec(unused struct cmd *self, struct cmd_ctx *ctx)
 	tim = ctime(&start_time);
 	*strchr(tim, '\n') = '\0';
 	ctx->print(ctx, "pid %ld, started %s", (long) getpid(), tim);
-	ctx->print(ctx, "socket path %s, debug level %d%s%s",
-	    socket_path, debug_level, be_quiet ? ", quiet" : "",
-	    login_shell ? ", login shell" : "");
+	ctx->print(ctx, "socket path %s, debug level %d%s",
+	    socket_path, debug_level, be_quiet ? ", quiet" : "");
         if (uname(&un) == 0) {
                 ctx->print(ctx, "system is %s %s %s %s",
 		    un.sysname, un.release, un.version, un.machine);