diff --git a/main/postmarketos-ui-phosh/60-lightdm-autologin.conf b/main/postmarketos-ui-phosh/60-lightdm-autologin.conf
index f5b313248..a2cb47cd3 100644
--- a/main/postmarketos-ui-phosh/60-lightdm-autologin.conf
+++ b/main/postmarketos-ui-phosh/60-lightdm-autologin.conf
@@ -1,5 +1,5 @@
 # This file gets removed with postmarketos-ui-phosh, even if modified!
 [Seat:*]
-autologin-user=username
-autologin-user-timeout=0
-autologin-session=phosh
+autologin-user=
+greeter-session=lightdm-mobile-greeter
+user-session=phosh
diff --git a/main/postmarketos-ui-phosh/APKBUILD b/main/postmarketos-ui-phosh/APKBUILD
index 36fdda7f8..a9119dd9e 100644
--- a/main/postmarketos-ui-phosh/APKBUILD
+++ b/main/postmarketos-ui-phosh/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=postmarketos-ui-phosh
 pkgver=4
-pkgrel=3
+pkgrel=4
 pkgdesc="(Wayland) Mobile UI developed for the Librem 5 (works only with numeric passwords!)"
 url="https://puri.sm"
 arch="noarch !armhf !x86" # x86: aports#11807
@@ -11,6 +11,7 @@ depends="bluez
 	iio-sensor-proxy
 	lightdm
 	lightdm-openrc
+	lightdm-mobile-greeter
 	phosh
 	polkit-elogind
 	pulseaudio
@@ -71,8 +72,7 @@ qt_tweaks() {
 	install -Dm755 "$srcdir"/qt-tweaks.sh \
 		"$subpkgdir"/etc/profile.d/phosh-qt-tweaks.sh
 }
-
-sha512sums="c51a5cf93495069d71900dd1c6fbddfa3bdfb70dbab8141d1b115b6150975a12206c63517f18dc516e0366028b32e014b6d37a20e19ff73d5f0934c518d3ab39  60-lightdm-autologin.conf
+sha512sums="de97f8a0a6ede3c68826f87e83660ab063ad57472784062d8412d6265a55292e45b78c458fa26cccb23d0affb20210cd3106c9b589bc590dc386fb21c3a24d9a  60-lightdm-autologin.conf
 b0d3b12f5650fdd15be9dcd085d77cca7215182e91494280086b0093391e2ad384eebb1f9ca373f5386f25362941c7fd32c25110fde45aac3f068f192c664ef2  000-gschema.override
 4113ef59267e88d205ef1e1aec0ed11ccf817a25c232f2006a538b56fb466fad5025ad445d109e367ca92ee98d9b25f1f9a1a4b9bae2cb80df12a3739d62d10a  osk.sh
 57793bb079c76ba3bdcfca7880aa887de11fe80e7a05557b78435e57feabab70fbaeedc42da3aec6f914c35bba8e8ee9918367516eb45ee247f63f694624f179  gtk-app-wayland.sh
diff --git a/main/postmarketos-ui-phosh/postmarketos-ui-phosh.post-install b/main/postmarketos-ui-phosh/postmarketos-ui-phosh.post-install
index 87396062c..6553e5bad 100644
--- a/main/postmarketos-ui-phosh/postmarketos-ui-phosh.post-install
+++ b/main/postmarketos-ui-phosh/postmarketos-ui-phosh.post-install
@@ -1,7 +1,5 @@
 #!/bin/sh
 
-sed -i "s/username/$(getent passwd 10000 | cut -d: -f1)/g" /usr/share/lightdm/lightdm.conf.d/60-autologin.conf
-
 rc-update add lightdm default
 rc-update add modemmanager default
 rc-update add bluetooth default