diff --git a/lib/ey-deploy/configuration.rb b/lib/ey-deploy/configuration.rb
index <HASH>..<HASH> 100644
--- a/lib/ey-deploy/configuration.rb
+++ b/lib/ey-deploy/configuration.rb
@@ -1,5 +1,6 @@
 require 'json'
 require 'thor'
+require 'etc'
 
 module EY
   class Deploy::Configuration
@@ -73,7 +74,7 @@ module EY
     end
 
     def user
-      node['users'].first['username'] || 'nobody'
+      Etc.getlogin
     end
     alias :group :user
Get the username from the system, rather than the node

Change-Id: I6ff<I>cde<I>fc<I>dfc8bb3afdbaa<I>a6f4d<I>c