From d0d257d7434d87c3950fedaeaf1bbea736229251 Mon Sep 17 00:00:00 2001
From: "Oussema.exe" <oussamahassini6@gmail.com>
Date: Sat, 21 Dec 2019 16:00:54 +0100
Subject: [PATCH] Fix #3140 - Fixes flashing tooltip (#3166)

---
 app/views/selfservice/createuser.html | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/app/views/selfservice/createuser.html b/app/views/selfservice/createuser.html
index 6e4e94d5..87922081 100644
--- a/app/views/selfservice/createuser.html
+++ b/app/views/selfservice/createuser.html
@@ -72,16 +72,17 @@
                     <div class="col-sm-3">
                             <input type="checkbox" ng-model="formData.sendPasswordToEmail">
                     </div>
-
-                    <label class="control-label col-sm-3">{{'label.input.overridepasswordexpiry' | translate}}
-                        <i class="fa fa-question-circle control-label fa fa-align-left"
-                        uib-tooltip="{{'label.tooltip.overridepasswordexpiry' | translate}}"></i></label>
-                        <div class="col-sm-3">
-                            <label class="checkbox">
-                                <input type="checkbox" ng-model="formData.passwordNeverExpires">
-                            </label>
-                        </div>
                 </div>
+
+                <div class="form-group">
+                    <label class="control-label col-sm-2">{{'label.input.overridepasswordexpiry' | translate}}</label>
+
+                        <div class="col-sm-3">
+                            <input type="checkbox" ng-model="formData.passwordNeverExpires">
+                            <i class="fa fa-question-circle fa fa-align-left"
+                               uib-tooltip="{{'label.tooltip.overridepasswordexpiry' | translate}}"></i>
+                        </div>
+                    </div>
                 <div data-ng-switch on="formData.sendPasswordToEmail">
                     <div data-ng-switch-when="false">
                         <div class="form-group">
@@ -140,4 +141,4 @@
                 <button class="btn btn-default" ng-click="cancel()">{{'label.button.close' | translate}}</button>
             </div>
         </script>
-</div>
\ No newline at end of file
+</div>