diff --git a/src/modules/login/LoginStatusPane.tsx b/src/modules/login/LoginStatusPane.tsx
index 4ec0d00..a94c570 100644
--- a/src/modules/login/LoginStatusPane.tsx
+++ b/src/modules/login/LoginStatusPane.tsx
@@ -40,7 +40,9 @@ const LoginStatusPane: FC<Props> = ({ login }) => {
 
     case LoginStatus.Success:
       statusText = `logged in as ${login.username}`;
-      motd = <span id="login-status-motd">MOTD: {login.motd}</span>;
+      if (login.motd) {
+        motd = <span id="login-status-motd">MOTD: {login.motd}</span>;
+      }
       break;
 
     case LoginStatus.Failure:
@@ -54,7 +56,7 @@ const LoginStatusPane: FC<Props> = ({ login }) => {
   }
 
   return (
-    <div className="p-3">
+    <div className="p-3 flex gap-x-1">
       <span>
         <span className="font-bold text-yellow-800">Login status:</span>{" "}
         {statusText}