diff --git a/roles/iiab-admin/tasks/main.yml b/roles/iiab-admin/tasks/main.yml
index b2c0a3aea..ea3c2f039 100644
--- a/roles/iiab-admin/tasks/main.yml
+++ b/roles/iiab-admin/tasks/main.yml
@@ -21,24 +21,32 @@
     - option: iiab_admin_user
       value: "{{ iiab_admin_user }}"
 
-- name: Install /etc/profile.d/profile_ssh_warn.sh from template, to issue warnings (during shell/ssh logins) if iiab-admin password is still default
+- name: Install /etc/profile.d/sshpwd-profile-iiab.sh from template, to issue warnings (during shell/ssh logins) if iiab-admin password is the default
   template:
-    src: profile_ssh_warn.sh
+    src: sshpwd-profile-iiab.sh
     dest: /etc/profile.d/
+    mode: 0644
 
-- name: Is this LXDE?
+- name: Is this LXDE-pi?
   stat:
-    path: /home/pi/.config/lxsession
+    path: /etc/xdg/lxsession/LXDE-pi
   register: lx
 
-- name: "Likewise for Raspbian, installing: /home/pi/.config/lxsession/LXDE-pi/lxde_ssh_warn.sh"
+- name: "Likewise for Raspbian, installing: /etc/xdg/lxsession/LXDE-pi/sshpwd-lxde-iiab.sh"
   template:
-    src: lxde_ssh_warn.sh
-    dest: /home/pi/.config/lxsession/LXDE-pi/
+    src: sshpwd-lxde-iiab.sh
+    dest: /etc/xdg/lxsession/LXDE-pi/
+    mode: 0755
   when: lx.stat.isdir is defined and lx.stat.isdir and is_rpi and is_debuntu
 
-- name: Put line in /home/pi/.config/lxsession/LXDE-pi/autostart to run the above (raspbian)
+# 2019-03-07: This popup (/etc/xdg/lxsession/LXDE-pi/sshpwd-lxde-iiab.sh) does
+# not actually appear when triggered by /etc/xdg/autostart/pprompt-iiab.desktop
+# (or pprompt.desktop as Raspbian has working since 2018-11-13!)  Too bad as it
+# would be really nice to standardize this popup across Ubermix & all distros..
+# Is this a permissions/security issue presumably?
+
+- name: Put line in /etc/xdg/lxsession/LXDE-pi/autostart to run the above (raspbian)
   lineinfile:
-    path: /home/pi/.config/lxsession/LXDE-pi/autostart
-    line: "@/home/pi/.config/lxsession/LXDE-pi/lxde_ssh_warn.sh"
+    path: /etc/xdg/lxsession/LXDE-pi/autostart
+    line: "@/etc/xdg/lxsession/LXDE-pi/sshpwd-lxde-iiab.sh"
   when: lx.stat.isdir is defined and lx.stat.isdir and is_rpi and is_debuntu