diff --git a/app/Http/Controllers/CustomFieldsetsController.php b/app/Http/Controllers/CustomFieldsetsController.php
index dbee97b776..dc9bd6056e 100644
--- a/app/Http/Controllers/CustomFieldsetsController.php
+++ b/app/Http/Controllers/CustomFieldsetsController.php
@@ -51,13 +51,12 @@ class CustomFieldsetsController extends Controller
             $maxid = 0;
             foreach ($cfset->fields as $field) {
                 if ($field->pivot->order > $maxid) {
-                    $maxid = $field->pivot->order;
+                    $maxid = ($field->pivot->order);
                 }
                 if (isset($custom_fields_list[$field->id])) {
                     unset($custom_fields_list[$field->id]);
                 }
             }
-
             return view('custom_fields.fieldsets.view')->with('custom_fieldset', $cfset)->with('maxid', $maxid + 1)->with('custom_fields_list', $custom_fields_list);
         }
 
diff --git a/resources/views/custom_fields/fieldsets/view.blade.php b/resources/views/custom_fields/fieldsets/view.blade.php
index c330522cc1..003ee0cd84 100644
--- a/resources/views/custom_fields/fieldsets/view.blade.php
+++ b/resources/views/custom_fields/fieldsets/view.blade.php
@@ -51,7 +51,7 @@
                 </span>
               </td>
               @endcan
-              <td class="index">{{$field->pivot->order}}</td>
+              <td class="index">{{$field->pivot->order + 1}}</td>
               <td>{{$field->name}}</td>
               <td>{{$field->format}}</td>
               <td>{{$field->element}}</td>
diff --git a/resources/views/settings/ldap.blade.php b/resources/views/settings/ldap.blade.php
index b3070e13e1..fc8dd5161a 100644
--- a/resources/views/settings/ldap.blade.php
+++ b/resources/views/settings/ldap.blade.php
@@ -20,7 +20,7 @@
         }
     </style>
 
-    @if ((!function_exists('ldap_connect')) || (!function_exists('ldap_set_option')) || (!function_exists('ldap_bind')))
+    git checkout -b bug/sc-19126if ((!function_exists('ldap_connect')) || (!function_exists('ldap_set_option')) || (!function_exists('ldap_bind')))
         <div class="row">
             <div class="col-md-12">
                 <div class="col-md-12">