diff --git a/Envoy.blade.php b/Envoy.blade.php
index 668bc71..f879f6f 100644
--- a/Envoy.blade.php
+++ b/Envoy.blade.php
@@ -8,6 +8,11 @@
     if (empty($app_dir)) {
         throw new Exception("Need --app_dir param", 1);
     }
+
+    if (empty($app_user)) {
+        throw new Exception("Need --app_user param", 1);
+    }
+
     $releases_dir = $app_dir . '/releases';
     $storage_dir = $app_dir . '/storage';
     $release_no = date('YmdHis');
@@ -29,7 +34,7 @@
 @endtask
 
 @task('run_composer')
-    echo "Starting deployment ({{ $release }})"
+    echo "Starting deployment ({{ $release_no }})"
     cd {{ $new_release_dir }}
     composer install --prefer-dist --no-scripts -q -o
 @endtask
@@ -37,7 +42,15 @@
 @task('update_symlinks')
     echo "Linking storage directory"
     rm -rf {{ $new_release_dir }}/storage
-    [ -d {{ $storage_dir }} ] || mkdir {{ $storage_dir }} && mkdir {{ $storage_dir }}/framework && mkdir {{ $storage_dir }}/framework/cache && mkdir {{ $storage_dir }}/framework/sessions && mkdir {{ $storage_dir }}/framework/views
+    
+    if [ ! -d {{ $storage_dir }} ]; then
+        mkdir {{ $storage_dir }}
+        mkdir {{ $storage_dir }}/framework
+        mkdir {{ $storage_dir }}/framework/cache
+        mkdir {{ $storage_dir }}/framework/sessions
+        mkdir {{ $storage_dir }}/framework/views
+    fi
+
     ln -nfs {{ $storage_dir }} {{ $new_release_dir }}/storage
 
     echo 'Linking current release'
@@ -55,8 +68,8 @@
 @endtask
 
 @task('change_owner')
-    chown -R www:www {{ $app_dir }}
-    chown -R www:www {{ $releases_dir }}
-    chown -R www:www {{ $storage_dir }}
-    chown -R www:www {{ $new_release_dir }}
+    chown -R {{ $app_user }} {{ $app_dir }}
+    chown -R {{ $app_user }} {{ $releases_dir }}
+    chown -R {{ $app_user }} {{ $storage_dir }}
+    chown -R {{ $app_user }} {{ $new_release_dir }}
 @endtask
\ No newline at end of file