diff --git a/app/src/main/java/io/homeassistant/companion/android/vehicle/LoginScreen.kt b/app/src/main/java/io/homeassistant/companion/android/vehicle/LoginScreen.kt
index b6cc5c8e274..4dd383e53ce 100644
--- a/app/src/main/java/io/homeassistant/companion/android/vehicle/LoginScreen.kt
+++ b/app/src/main/java/io/homeassistant/companion/android/vehicle/LoginScreen.kt
@@ -5,6 +5,7 @@ import android.content.pm.PackageManager
 import androidx.car.app.CarContext
 import androidx.car.app.Screen
 import androidx.car.app.model.Action
+import androidx.car.app.model.CarIcon
 import androidx.car.app.model.MessageTemplate
 import androidx.car.app.model.ParkedOnlyOnClickListener
 import androidx.car.app.model.Template
@@ -42,17 +43,17 @@ class LoginScreen(context: CarContext, val serverManager: ServerManager) : Scree
     }
 
     override fun onGetTemplate(): Template {
-        return MessageTemplate.Builder(carContext.getString(R.string.aa_app_not_logged_in))
-            .setTitle(carContext.getString(R.string.app_name))
-            .setHeaderAction(Action.APP_ICON)
+        return MessageTemplate.Builder(carContext.getString(R.string.welcome_hass))
+            .setIcon(CarIcon.APP_ICON)
             .addAction(
                 Action.Builder()
-                    .setTitle(carContext.getString(R.string.login))
+                    .setTitle(carContext.getString(if (isAutomotive) R.string.login else R.string.login_on_phone))
                     .setOnClickListener(
                         ParkedOnlyOnClickListener.create {
                             startNativeActivity()
                         }
                     )
+                    .setFlags(Action.FLAG_PRIMARY)
                     .build()
             )
             .build()
diff --git a/common/src/main/res/values/strings.xml b/common/src/main/res/values/strings.xml
index 7be7f80359b..b50a9622b44 100644
--- a/common/src/main/res/values/strings.xml
+++ b/common/src/main/res/values/strings.xml
@@ -342,6 +342,7 @@
     <string name="logbook">Logbook</string>
     <string name="logged_in">Logged in</string>
     <string name="login">Login</string>
+    <string name="login_on_phone">Login on your phone</string>
     <string name="login_wear_os_device">Login Wear OS Device</string>
     <string name="logout">Logout</string>
     <string name="lovelace_view_dashboard">Dashboard View or Dashboard</string>