diff --git a/public/css/build/app.css b/public/css/build/app.css
index a74ffcfc2a..558970fa05 100644
--- a/public/css/build/app.css
+++ b/public/css/build/app.css
@@ -982,7 +982,7 @@ label.form-control {
   font-size: inherit;
   font-weight: inherit;
 }
-.form-control--disabled {
+label.form-control--disabled {
   color: #959495;
   pointer-events: none;
   cursor: not-allowed;
@@ -1013,6 +1013,7 @@ input[type="checkbox"] {
 /** This sets the display of a checkbox, and what the "fill" checkmark should look like */
 input[type="checkbox"]::before {
   /** If you want to use the non-checkbox, filled square, use this instead **/
+  box-shadow: inset 1em 1em #d3d3d3;
   content: "";
   width: 1em;
   height: 1em;
@@ -1029,14 +1030,14 @@ input[type="checkbox"]::before {
 input[type="checkbox"]:checked::before {
   transform: scale(1);
 }
-/** This sets the scale of the DISABLED but CHECKED checkbox */
+/** This sets the scale and color of the DISABLED but CHECKED checkbox */
 input[type=checkbox]:disabled::before,
 input[type=radio]:disabled::before {
   content: "";
   width: 1em;
   height: 1em;
   transform: scale(1);
-  box-shadow: inset 1em 1em #959495;
+  box-shadow: inset 1em 1em #d3d3d3;
 }
 /* This sets the scale and style of a DISABLED checkbox that is NOT checked */
 input[type=checkbox]:disabled:not(:checked)::before,
@@ -1046,9 +1047,10 @@ input[type=radio]:disabled:not(:checked)::before {
   cursor: not-allowed;
   pointer-events: none;
 }
+/** this is the color of the checkbox and content on a disabled, checked box **/
 input[type=checkbox]:disabled,
 input[type=radio]:disabled {
-  --form-control-color: #959495;
+  --form-control-color: #d3d3d3;
   color: #959495;
   cursor: not-allowed;
   pointer-events: none;
diff --git a/public/css/build/overrides.css b/public/css/build/overrides.css
index 058e30a137..37ec7d15c3 100644
--- a/public/css/build/overrides.css
+++ b/public/css/build/overrides.css
@@ -615,7 +615,7 @@ label.form-control {
   font-size: inherit;
   font-weight: inherit;
 }
-.form-control--disabled {
+label.form-control--disabled {
   color: #959495;
   pointer-events: none;
   cursor: not-allowed;
@@ -646,6 +646,7 @@ input[type="checkbox"] {
 /** This sets the display of a checkbox, and what the "fill" checkmark should look like */
 input[type="checkbox"]::before {
   /** If you want to use the non-checkbox, filled square, use this instead **/
+  box-shadow: inset 1em 1em #d3d3d3;
   content: "";
   width: 1em;
   height: 1em;
@@ -662,14 +663,14 @@ input[type="checkbox"]::before {
 input[type="checkbox"]:checked::before {
   transform: scale(1);
 }
-/** This sets the scale of the DISABLED but CHECKED checkbox */
+/** This sets the scale and color of the DISABLED but CHECKED checkbox */
 input[type=checkbox]:disabled::before,
 input[type=radio]:disabled::before {
   content: "";
   width: 1em;
   height: 1em;
   transform: scale(1);
-  box-shadow: inset 1em 1em #959495;
+  box-shadow: inset 1em 1em #d3d3d3;
 }
 /* This sets the scale and style of a DISABLED checkbox that is NOT checked */
 input[type=checkbox]:disabled:not(:checked)::before,
@@ -679,9 +680,10 @@ input[type=radio]:disabled:not(:checked)::before {
   cursor: not-allowed;
   pointer-events: none;
 }
+/** this is the color of the checkbox and content on a disabled, checked box **/
 input[type=checkbox]:disabled,
 input[type=radio]:disabled {
-  --form-control-color: #959495;
+  --form-control-color: #d3d3d3;
   color: #959495;
   cursor: not-allowed;
   pointer-events: none;
diff --git a/public/css/dist/all.css b/public/css/dist/all.css
index c9c03a25dc..5839a9a35d 100644
--- a/public/css/dist/all.css
+++ b/public/css/dist/all.css
@@ -23741,7 +23741,7 @@ label.form-control {
   font-size: inherit;
   font-weight: inherit;
 }
-.form-control--disabled {
+label.form-control--disabled {
   color: #959495;
   pointer-events: none;
   cursor: not-allowed;
@@ -23772,6 +23772,7 @@ input[type="checkbox"] {
 /** This sets the display of a checkbox, and what the "fill" checkmark should look like */
 input[type="checkbox"]::before {
   /** If you want to use the non-checkbox, filled square, use this instead **/
+  box-shadow: inset 1em 1em #d3d3d3;
   content: "";
   width: 1em;
   height: 1em;
@@ -23788,14 +23789,14 @@ input[type="checkbox"]::before {
 input[type="checkbox"]:checked::before {
   transform: scale(1);
 }
-/** This sets the scale of the DISABLED but CHECKED checkbox */
+/** This sets the scale and color of the DISABLED but CHECKED checkbox */
 input[type=checkbox]:disabled::before,
 input[type=radio]:disabled::before {
   content: "";
   width: 1em;
   height: 1em;
   transform: scale(1);
-  box-shadow: inset 1em 1em #959495;
+  box-shadow: inset 1em 1em #d3d3d3;
 }
 /* This sets the scale and style of a DISABLED checkbox that is NOT checked */
 input[type=checkbox]:disabled:not(:checked)::before,
@@ -23805,9 +23806,10 @@ input[type=radio]:disabled:not(:checked)::before {
   cursor: not-allowed;
   pointer-events: none;
 }
+/** this is the color of the checkbox and content on a disabled, checked box **/
 input[type=checkbox]:disabled,
 input[type=radio]:disabled {
-  --form-control-color: #959495;
+  --form-control-color: #d3d3d3;
   color: #959495;
   cursor: not-allowed;
   pointer-events: none;
@@ -24959,7 +24961,7 @@ label.form-control {
   font-size: inherit;
   font-weight: inherit;
 }
-.form-control--disabled {
+label.form-control--disabled {
   color: #959495;
   pointer-events: none;
   cursor: not-allowed;
@@ -24990,6 +24992,7 @@ input[type="checkbox"] {
 /** This sets the display of a checkbox, and what the "fill" checkmark should look like */
 input[type="checkbox"]::before {
   /** If you want to use the non-checkbox, filled square, use this instead **/
+  box-shadow: inset 1em 1em #d3d3d3;
   content: "";
   width: 1em;
   height: 1em;
@@ -25006,14 +25009,14 @@ input[type="checkbox"]::before {
 input[type="checkbox"]:checked::before {
   transform: scale(1);
 }
-/** This sets the scale of the DISABLED but CHECKED checkbox */
+/** This sets the scale and color of the DISABLED but CHECKED checkbox */
 input[type=checkbox]:disabled::before,
 input[type=radio]:disabled::before {
   content: "";
   width: 1em;
   height: 1em;
   transform: scale(1);
-  box-shadow: inset 1em 1em #959495;
+  box-shadow: inset 1em 1em #d3d3d3;
 }
 /* This sets the scale and style of a DISABLED checkbox that is NOT checked */
 input[type=checkbox]:disabled:not(:checked)::before,
@@ -25023,9 +25026,10 @@ input[type=radio]:disabled:not(:checked)::before {
   cursor: not-allowed;
   pointer-events: none;
 }
+/** this is the color of the checkbox and content on a disabled, checked box **/
 input[type=checkbox]:disabled,
 input[type=radio]:disabled {
-  --form-control-color: #959495;
+  --form-control-color: #d3d3d3;
   color: #959495;
   cursor: not-allowed;
   pointer-events: none;
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 1ce14addae..1a53ec8e0d 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -1,8 +1,8 @@
 {
     "/js/build/app.js": "/js/build/app.js?id=7caeae38608edd96421f8ef59d33f5f6",
     "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=f677207c6cf9678eb539abecb408c374",
-    "/css/build/overrides.css": "/css/build/overrides.css?id=fcd2390cb449bfb8f93d0cc2342c06ad",
-    "/css/build/app.css": "/css/build/app.css?id=41f3c631198b89b1319d91200d521dfc",
+    "/css/build/overrides.css": "/css/build/overrides.css?id=ce23fa22306439befbf49e8e63adb4e0",
+    "/css/build/app.css": "/css/build/app.css?id=2e40bdf6f6d3d6d6954c391a0a91285e",
     "/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=dc383f8560a8d4adb51d44fb4043e03b",
     "/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=6f0563e726c2fe4fab4026daaa5bfdf2",
     "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=f343f659ca1d45534d2c2c3cc30fb619",
@@ -18,7 +18,7 @@
     "/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=0a82a6ae6bb4e58fe62d162c4fb50397",
     "/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=da6c7997d9de2f8329142399f0ce50da",
     "/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=44bf834f2110504a793dadec132a5898",
-    "/css/dist/all.css": "/css/dist/all.css?id=5c636e1435c3abc16b28184b18c65056",
+    "/css/dist/all.css": "/css/dist/all.css?id=a637a7360cc5ed945bedda88a468bead",
     "/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced1cf5f13147f7",
     "/css/dist/signature-pad.min.css": "/css/dist/signature-pad.min.css?id=6a89d3cd901305e66ced1cf5f13147f7",
     "/css/webfonts/fa-brands-400.ttf": "/css/webfonts/fa-brands-400.ttf?id=2df05d4beaa48550d71234e8dca79141",
diff --git a/resources/assets/less/overrides.less b/resources/assets/less/overrides.less
index fd5a13bfa3..23d87fe6f4 100644
--- a/resources/assets/less/overrides.less
+++ b/resources/assets/less/overrides.less
@@ -704,7 +704,7 @@ label.form-control {
   font-weight: inherit;
 }
 
-.form-control--disabled {
+label.form-control--disabled {
   color: #959495;
   pointer-events:none;
   cursor: not-allowed;
@@ -738,12 +738,12 @@ input[type="checkbox"] {
 input[type="checkbox"]::before {
 
 /** If you want to use the non-checkbox, filled square, use this instead **/
-//  content: "";
-//  width: 1em;
-//  height: 1em;
-//  transform: scale(0);
-//  transition: 120ms transform ease-in-out;
-//  box-shadow: inset 1em 1em #428bca;
+  content: "";
+  width: 1em;
+  height: 1em;
+  transform: scale(0);
+  transition: 120ms transform ease-in-out;
+  box-shadow: inset 1em 1em rgb(211, 211, 211);
 
   content: "";
   width: 1em;
@@ -762,13 +762,13 @@ input[type="checkbox"]:checked::before {
   transform: scale(1);
 }
 
-/** This sets the scale of the DISABLED but CHECKED checkbox */
+/** This sets the scale and color of the DISABLED but CHECKED checkbox */
 input[type=checkbox]:disabled::before, input[type=radio]:disabled::before {
   content: "";
   width: 1em;
   height: 1em;
   transform: scale(1);
-  box-shadow: inset 1em 1em #959495;
+  box-shadow: inset 1em 1em rgb(211, 211, 211);
 }
 
 /* This sets the scale and style of a DISABLED checkbox that is NOT checked */
@@ -779,8 +779,9 @@ input[type=checkbox]:disabled:not(:checked)::before, input[type=radio]:disabled:
   pointer-events:none;
 }
 
+/** this is the color of the checkbox and content on a disabled, checked box **/
 input[type=checkbox]:disabled, input[type=radio]:disabled {
-  --form-control-color: #959495;
+  --form-control-color: rgb(211, 211, 211);
   color: #959495;
   cursor: not-allowed;
   pointer-events:none;
diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php
index f36b4a8ebd..d7c956b22f 100755
--- a/resources/views/users/edit.blade.php
+++ b/resources/views/users/edit.blade.php
@@ -220,8 +220,7 @@
                               @elseif ($user->id === Auth::user()->id)
                                   <!-- disallow the user from editing their own login status -->
                                   <label class="form-control form-control--disabled">
-                                      <input type="checkbox" value="1" name="activated" class="disabled" {{ (old('activated', $user->activated)) == '1' ? ' checked="checked"' : '' }} disabled="disabled">
-                                      {{ Form::checkbox('activated', '1', old('activated'), ['disabled' => true, 'checked'=> 'checked', 'aria-label'=>'update_real_loc']) }}
+                                      {{ Form::checkbox('activated', '1', old('activated', $user->activated), ['disabled' => true, 'checked'=> 'checked', 'aria-label'=>'update_real_loc']) }}
                                       {{ trans('admin/users/general.activated_help_text') }}
                                   </label>
                                   <p class="text-warning">{{ trans('admin/users/general.activated_disabled_help_text') }}</p>
@@ -264,7 +263,7 @@
                   @if (!$user->id)
                       <div class="form-group" id="email_user_row">
 
-                          <div class="col-md-9 col-md-offset-3">
+                          <div class="col-md-8 col-md-offset-3">
                               <label class="form-control form-control--disabled">
 
                                   {{ Form::checkbox('email_user', '1', old('email_user'), ['id' => "email_user_checkbox", 'aria-label'=>'email_user']) }}
@@ -277,7 +276,7 @@
                           </div>
                       </div> <!--/form-group-->
                   @endif
-                  
+
                   @include ('partials.forms.edit.image-upload', ['fieldname' => 'avatar', 'image_path' => app('users_upload_path')])