diff --git a/roles/iiab-admin/tasks/pwd-warnings.yml b/roles/iiab-admin/tasks/pwd-warnings.yml
index fba510883..d12ef87e0 100644
--- a/roles/iiab-admin/tasks/pwd-warnings.yml
+++ b/roles/iiab-admin/tasks/pwd-warnings.yml
@@ -1,7 +1,7 @@
 - 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: sshpwd-profile-iiab.sh
-    dest: /etc/profile.d/
+    src: sshpwd-profile-iiab.sh.j2
+    dest: /etc/profile.d/sshpwd-profile-iiab.sh
     mode: '0644'
 
 - name: Is this LXDE-pi?
@@ -11,8 +11,8 @@
 
 - name: "Likewise for Raspbian, installing: /etc/xdg/lxsession/LXDE-pi/sshpwd-lxde-iiab.sh"
   template:
-    src: sshpwd-lxde-iiab.sh
-    dest: /etc/xdg/lxsession/LXDE-pi/
+    src: sshpwd-lxde-iiab.sh.j2
+    dest: /etc/xdg/lxsession/LXDE-pi/sshpwd-lxde-iiab.sh
     mode: '0755'
   when: lx.stat.isdir is defined and lx.stat.isdir and is_raspbian and is_debuntu
 
@@ -28,4 +28,4 @@
   lineinfile:
     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_raspbian and is_debuntu
+  when: lx.stat.isdir is defined and lx.stat.isdir and is_raspbian
diff --git a/roles/iiab-admin/templates/sshpwd-lxde-iiab.sh b/roles/iiab-admin/templates/sshpwd-lxde-iiab.sh.j2
similarity index 100%
rename from roles/iiab-admin/templates/sshpwd-lxde-iiab.sh
rename to roles/iiab-admin/templates/sshpwd-lxde-iiab.sh.j2
diff --git a/roles/iiab-admin/templates/sshpwd-profile-iiab.sh b/roles/iiab-admin/templates/sshpwd-profile-iiab.sh.j2
similarity index 100%
rename from roles/iiab-admin/templates/sshpwd-profile-iiab.sh
rename to roles/iiab-admin/templates/sshpwd-profile-iiab.sh.j2