diff --git a/roles/wsgi_website/tasks/main.yml b/roles/wsgi_website/tasks/main.yml
index 5ffaa1b01730afaab10e8f9ca6ca8cc4602af3c5..61b8d036d6f2bf890c01be1a8fcf44172e535fdc 100644
--- a/roles/wsgi_website/tasks/main.yml
+++ b/roles/wsgi_website/tasks/main.yml
@@ -10,11 +10,15 @@
 
 - name: Create WSGI website admin user
   user: name="{{ admin }}" uid="{{ admin_uid | default(omit) }}" group="{{ user }}"
-        shell=/bin/bash createhome=no home="{{ home }}" state=present
+        shell=/bin/bash createhome=yes home="{{ home }}" state=present
 
-- name: Create home directory for the user (avoid populating with skeleton)
-  file: path="{{ home }}" state=directory
-        owner="{{ admin }}" group="{{ user }}" mode=2750
+- name: Set-up directory for storing user profile configuration files
+  file: path="{{ home }}/.profile.d" state=directory
+        owner="{{ admin }}" group="{{ user }}" mode=750
+
+- name: Deploy profile configuration file for auto-activating the virtual environment
+  copy: src="profile_virtualenv.sh" dest="{{ home }}/.profile.d/virtualenv.sh"
+        owner="root" group="{{ user }}" mode="640"
 
 - name: Create WSGI website user
   user: name="{{ user }}" uid="{{ uid | default(omit) }}" group="{{ user }}" comment="umask=0007"
@@ -47,13 +51,6 @@
   template: src="venv_exec.j2" dest="{{ home }}/virtualenv/bin/exec"
             owner="{{ admin }}" group="{{ user }}" mode="750"
 
-- name: Deploy minimalistic bashrc for auto-activating the virtual environment
-  copy: src="bashrc" dest="{{ item }}"
-        owner="root" group="{{ user }}" mode="640"
-  with_items:
-    - "{{ home }}/.bashrc"
-    - "{{ home }}/.profile"
-
 - name: Install futures package for use with Gunicorn thread workers
   become_user: "{{ admin }}"
   pip: name=futures version="{{ futures_version }}" state=present virtualenv="{{ home }}/virtualenv"