diff --git a/src/app/organizations/policies/master-password.component.html b/src/app/organizations/policies/master-password.component.html
index 830d8ac5..a4ed6ae1 100644
--- a/src/app/organizations/policies/master-password.component.html
+++ b/src/app/organizations/policies/master-password.component.html
@@ -7,13 +7,13 @@
     </div>
 
     <div class="row">
-        <div class="col-6 form-group">
+        <div class="col-12 col-md-6 mt-4 mt-md-0 form-group">
             <label for="minComplexity">{{'minComplexityScore' | i18n}}</label>
             <select id="minComplexity" name="minComplexity" formControlName="minComplexity" class="form-control">
                 <option *ngFor="let o of passwordScores" [ngValue]="o.value">{{o.name}}</option>
             </select>
         </div>
-        <div class="col-6 form-group">
+        <div class="col-12 col-md-6 mt-4 mt-md-0 form-group">
             <label for="minLength">{{'minLength' | i18n}}</label>
             <input id="minLength" class="form-control" type="number" min="8" name="minLength"
                 formControlName="minLength">
diff --git a/src/app/organizations/policies/password-generator.component.html b/src/app/organizations/policies/password-generator.component.html
index 86841841..b189011d 100644
--- a/src/app/organizations/policies/password-generator.component.html
+++ b/src/app/organizations/policies/password-generator.component.html
@@ -7,7 +7,7 @@
     </div>
 
     <div class="row">
-        <div class="col-6 form-group  mb-0">
+        <div class="col-12 col-md-6 mt-4 mt-md-0 form-group  mb-0">
             <label for="defaultType">{{'defaultType' | i18n}}</label>
             <select id="defaultType" name="defaultType" formControlName="defaultType" class="form-control">
                 <option *ngFor="let o of defaultTypes" [ngValue]="o.value">{{o.name}}</option>
@@ -16,19 +16,19 @@
     </div>
     <h3 class="mt-4">{{'password' | i18n}}</h3>
     <div class="row">
-        <div class="col-6 form-group">
+        <div class="col-12 col-md-6 mt-4 mt-md-0 form-group">
             <label for="minLength">{{'minLength' | i18n}}</label>
             <input id="minLength" class="form-control" type="number" name="minLength" min="5" max="128"
                 formControlName="minLength">
         </div>
     </div>
     <div class="row">
-        <div class="col-6 form-group">
+        <div class="col-12 col-md-6 mt-4 mt-md-0 form-group">
             <label for="minNumbers">{{'minNumbers' | i18n}}</label>
             <input id="minNumbers" class="form-control" type="number" name="minNumbers" min="0" max="9"
                 formControlName="minNumbers">
         </div>
-        <div class="col-6 form-group">
+        <div class="col-12 col-md-6 mt-4 mt-md-0 form-group">
             <label for="minSpecial">{{'minSpecial' | i18n}}</label>
             <input id="minSpecial" class="form-control" type="number" name="minSpecial" min="0" max="9"
                 formControlName="minSpecial">
@@ -53,7 +53,7 @@
     </div>
     <h3 class="mt-4">{{'passphrase' | i18n}}</h3>
     <div class="row">
-        <div class="col-6 form-group">
+        <div class="col-12 col-md-6 mt-4 mt-md-0 form-group">
             <label for="minNumberWords">{{'minimumNumberOfWords' | i18n}}</label>
             <input id="minNumberWords" class="form-control" type="number" name="minNumberWords" min="3" max="20"
                 formControlName="minNumberWords">