diff --git a/data/login.d/04local_cert b/30local_cert
similarity index 100%
rename from data/login.d/04local_cert
rename to 30local_cert
diff --git a/data/login.d/05fast_login b/data/login.d/05fast_login
index 4e1c777..6252a72 100644
--- a/data/login.d/05fast_login
+++ b/data/login.d/05fast_login
@@ -17,7 +17,8 @@ run_script() {
 	# skip cl-desktop and other scripts: user profile is configured already
 	if [[ "${DOMAIN_USER}" == "off" ]] &&
 		[[ -d ${HOME_DIR}/.calculate ]] &&
-		[[ -f /var/lib/calculate/calculate-desktop/fastlogin/${USER} ]]
+		[[ -f /var/lib/calculate/calculate-desktop/fastlogin/${USER} ]] &&
+		/usr/libexec/calculate/cl-check-admin $USER
 	then
 		# break as success xdm --login
 		return 2