diff --git a/defaults/main.yml b/defaults/main.yml
index e9b3d45..b176ff8 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,4 +1,5 @@
 ---
 # defaults file for /usr/local/google/home/friasc/apigee-workspace/apigee-opdk-role-workspace/apigee-opdk-admin-user
 pubkey: '~/.ssh/id_rsa.pub'
-permit_root_login: False
\ No newline at end of file
+permit_root_login: False
+user: "{{ opdk_user_name }}"
diff --git a/tasks/main.yml b/tasks/main.yml
index f418b8a..0da9326 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -9,7 +9,7 @@
 - name: Update user with NOPASSWD
   lineinfile:
     state: present
-    line: "{{ user }} ALL = NOPASSWD : ALL"
+    line: "{{ user | default('apigee') }} ALL = NOPASSWD : ALL"
     path: /etc/sudoers
     validate: '/usr/sbin/visudo -cf %s'