diff --git a/tasks/main.yml b/tasks/main.yml
index 3245e0c..eda96bb 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -55,10 +55,11 @@
 
 - name: "Configure djangoapp"
   template:
-    src: "{{ django_appname }}/settings_template.py.j2"
+    src: "{{ django_home }}/{{ django_appname }}/settings_template.py.j2"
     dest: "{{ django_home }}/{{ django_appname }}/settings.py"
     owner: "{{ django_user }}"
     group: "{{ django_group }}"
+    remote: True
     mode: 0600
   notify: "Restart djangoapp"
 
@@ -87,7 +88,7 @@
 
 - name: "set superuser password"
   django_manage:
-    command: shell -c "from django.contrib.auth.models import User; usr = User.objects.get(username='admin'); usr.set_password('{{ im_admin_password }}'); usr.save()"
+    command: shell -c "from django.contrib.auth.models import User; usr = User.objects.get(username='admin'); usr.set_password('{{ django_admin_password }}'); usr.save()"
     app_path: "{{ django_home }}/{{ django_appname }}/"
   become: true
   become_user: "{{ django_user }}"