diff --git a/resources/lang/en/general.php b/resources/lang/en/general.php
index 0676cf9e99..ee7287515f 100644
--- a/resources/lang/en/general.php
+++ b/resources/lang/en/general.php
@@ -136,7 +136,7 @@
     'licenses'				=> 'Licenses',
     'list_all'				=> 'List All',
     'loading'				=> 'Loading',
-    'lock_passwords'        => 'This field cannot be edited in this installation.',
+    'lock_passwords'        => 'This field value will not be saved in a demo installation.',
     'feature_disabled'      => 'This feature has been disabled for the demo installation.',
     'location'              => 'Location',
     'locations'				=> 'Locations',
diff --git a/resources/views/partials/forms/edit/uploadLogo.blade.php b/resources/views/partials/forms/edit/uploadLogo.blade.php
index 2a9c7dce01..633c1efd37 100644
--- a/resources/views/partials/forms/edit/uploadLogo.blade.php
+++ b/resources/views/partials/forms/edit/uploadLogo.blade.php
@@ -14,6 +14,10 @@
         <p class="help-block" id="{{ $logoId }}-status">
             {{ $helpBlock }}
         </p>
+
+        @if (config('app.lock_passwords')===true)
+            <p class="text-warning"><i class="fa fa-warning"></i>{{ trans('general.feature_disabled') }}</p>
+        @endif
         {!! $errors->first($logoVariable, '<span class="alert-msg">:message</span>') !!}
 
     </div>
diff --git a/resources/views/settings/branding.blade.php b/resources/views/settings/branding.blade.php
index 15fa1266dc..b739e3049b 100644
--- a/resources/views/settings/branding.blade.php
+++ b/resources/views/settings/branding.blade.php
@@ -49,6 +49,7 @@
                             <div class="col-md-7 required">
                                 @if (config('app.lock_passwords')===true)
                                     {{ Form::text('site_name', Request::old('site_name', $setting->site_name), array('class' => 'form-control', 'disabled'=>'disabled','placeholder' => 'Snipe-IT Asset Management')) }}
+                                    <p class="text-warning"><i class="fa fa-warning"></i>{{ trans('general.feature_disabled') }}</p>
                                 @else
                                     {{ Form::text('site_name',
                                         Request::old('site_name', $setting->site_name), array('class' => 'form-control','placeholder' => 'Snipe-IT Asset Management', 'data-validation' => 'required')) }}
@@ -170,7 +171,7 @@
                                 @if (config('app.lock_passwords')===true)
                                     {{ Form::textarea('custom_css', old('custom_css', $setting->custom_css), array('class' => 'form-control','placeholder' => 'Add your custom CSS','disabled'=>'disabled', 'aria-label'=>'custom_css')) }}
                                     {!! $errors->first('custom_css', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
-                                    <p class="help-block">{{ trans('general.lock_passwords') }}</p>
+                                    <p class="text-warning"><i class="fa fa-warning"></i>{{ trans('general.feature_disabled') }}</p>
                                 @else
                                     {{ Form::textarea('custom_css', old('custom_css', $setting->custom_css), array('class' => 'form-control','placeholder' => 'Add your custom CSS', 'aria-label'=>'custom_css')) }}
                                     {!! $errors->first('custom_css', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
@@ -188,6 +189,7 @@
                             <div class="col-md-9">
                                 @if (config('app.lock_passwords')===true)
                                     {!! Form::select('support_footer', array('on'=>'Enabled','off'=>'Disabled','admin'=>'Superadmin Only'), Request::old('support_footer', $setting->support_footer), ['class' => 'form-control select2 disabled', 'style'=>'width: 150px ;', 'disabled' => 'disabled']) !!}
+                                    <p class="text-warning"><i class="fa fa-warning"></i>{{ trans('general.feature_disabled') }}</p>
                                 @else
                                     {!! Form::select('support_footer', array('on'=>'Enabled','off'=>'Disabled','admin'=>'Superadmin Only'), Request::old('support_footer', $setting->support_footer), array('class' => 'form-control select2', 'style'=>'width: 150px ;')) !!}
                                 @endif
@@ -206,6 +208,7 @@
                             <div class="col-md-9">
                                 @if (config('app.lock_passwords')===true)
                                     {!! Form::select('version_footer', array('on'=>'Enabled','off'=>'Disabled','admin'=>'Superadmin Only'), Request::old('version_footer', $setting->version_footer), ['class' => 'form-control select2 disabled', 'style'=>'width: 150px ;', 'disabled' => 'disabled']) !!}
+                                    <p class="text-warning"><i class="fa fa-warning"></i>{{ trans('general.feature_disabled') }}</p>
                                 @else
                                     {!! Form::select('version_footer', array('on'=>'Enabled','off'=>'Disabled','admin'=>'Superadmin Only'), Request::old('version_footer', $setting->version_footer), array('class' => 'form-control select2', 'style'=>'width: 150px ;')) !!}
                                 @endif
@@ -223,7 +226,7 @@
                             <div class="col-md-9">
                                 @if (config('app.lock_passwords')===true)
                                     {{ Form::textarea('footer_text', Request::old('footer_text', $setting->footer_text), array('class' => 'form-control', 'rows' => '4', 'placeholder' => 'Optional footer text','disabled'=>'disabled')) }}
-                                    <p class="help-block">{{ trans('general.lock_passwords') }}</p>
+                                    <p class="text-warning"><i class="fa fa-warning"></i>{{ trans('general.feature_disabled') }}</p>
                                 @else
                                     {{ Form::textarea('footer_text', Request::old('footer_text', $setting->footer_text), array('class' => 'form-control','rows' => '4','placeholder' => 'Optional footer text')) }}
                                 @endif