diff --git a/roles/pam_sshd/tasks/main.yml b/roles/pam_sshd/tasks/main.yml
index d4eee77bc7248c5f95d5ff37a449e08446f371ab..2033aa3438b7fd7a5f518d1e0d66ec4fb7f91076 100644
--- a/roles/pam_sshd/tasks/main.yml
+++ b/roles/pam_sshd/tasks/main.yml
@@ -22,6 +22,12 @@
   become_user: root
   when: computenodepam is defined and computenodepam and ansible_os_family=="Debian"
 
+- name: "Copy computenode password sshd pam config"
+  template: src=common-session_ubuntu.j2 dest=/etc/pam.d/common-session
+  become: true
+  become_user: root
+  when: computenodepam is defined and computenodepam and ansible_os_family=="Debian"
+
 - name: "Copy computenode password sshd pam config"
   template: src=computenodes_sshd_centos.j2 dest=/etc/pam.d/sshd
   become: true
diff --git a/roles/pam_sshd/templates/computenodes_sshd_ubuntu.j2 b/roles/pam_sshd/templates/computenodes_sshd_ubuntu.j2
index 2b3a5f61603ba33be0023903a65b3fc4d2e7d3ed..aee26b0cd05d5180bce70db2e5e86312638e0a1d 100644
--- a/roles/pam_sshd/templates/computenodes_sshd_ubuntu.j2
+++ b/roles/pam_sshd/templates/computenodes_sshd_ubuntu.j2
@@ -15,6 +15,8 @@ account    required     pam_nologin.so
 
 # Standard Un*x authorization.
 @include common-account
+-account   sufficient     pam_slurm_adopt.so
+account  required     pam_access.so
 
 # SELinux needs to be the first session rule.  This ensures that any
 # lingering context has been cleared.  Without this it is possible that a