diff --git a/proxstar/tasks.py b/proxstar/tasks.py
index ed86620..f695f16 100644
--- a/proxstar/tasks.py
+++ b/proxstar/tasks.py
@@ -152,6 +152,9 @@ def setup_template(template_id, name, user, password, cores, memory):
         stdin, stdout, stderr = client.exec_command(
             "echo '{}' | passwd '{}' --stdin".format(password, user))
         exit_status = stdout.channel.recv_exit_status()
+        stdin, stdout, stderr = client.exec_command(
+            "passwd -e '{}'".format(user))
+        exit_status = stdout.channel.recv_exit_status()
         stdin, stdout, stderr = client.exec_command(
             "echo '{} ALL=(ALL:ALL) ALL' | sudo EDITOR='tee -a' visudo".format(
                 user))