diff --git a/resources/views/account/profile.blade.php b/resources/views/account/profile.blade.php
index 887624c85f..2c3158c88f 100755
--- a/resources/views/account/profile.blade.php
+++ b/resources/views/account/profile.blade.php
@@ -123,8 +123,7 @@
         @endif
 
 
-        @include ('partials.forms.edit.image-upload', ['fieldname' => 'avatar'])
-
+        @include ('partials.forms.edit.image-upload', ['fieldname' => 'avatar', 'image_path' => app('users_upload_path')])
 
 
         <!-- Two factor opt in -->
diff --git a/resources/views/partials/forms/edit/image-upload.blade.php b/resources/views/partials/forms/edit/image-upload.blade.php
index fde6af69ee..577f90eaac 100644
--- a/resources/views/partials/forms/edit/image-upload.blade.php
+++ b/resources/views/partials/forms/edit/image-upload.blade.php
@@ -1,5 +1,6 @@
-<!-- Image -->
-@if (($item->image) && ($item->image!=''))
+<!-- Image stuff - kept in /resources/views/partials/forms/edit/image-upload.blade.php -->
+<!-- Image Delete -->
+@if (isset($item) && ($item->image) && ($item->image!=''))
     <div class="form-group{{ $errors->has('image_delete') ? ' has-error' : '' }}">
         <div class="col-md-9 col-md-offset-3">
             <label class="form-control">
@@ -17,6 +18,8 @@
     </div>
 @endif
 
+<!-- Image Upload and preview -->
+
 <div class="form-group {{ $errors->has((isset($fieldname) ? $fieldname : 'image')) ? 'has-error' : '' }}">
     <label class="col-md-3 control-label" for="{{ (isset($fieldname) ? $fieldname : 'image') }}">{{ trans('general.image_upload') }}</label>
     <div class="col-md-9">