diff --git a/odex25_base/mpl_login_background/controllers/main.py b/odex25_base/mpl_login_background/controllers/main.py
index eda1f4021..a6c1f745e 100644
--- a/odex25_base/mpl_login_background/controllers/main.py
+++ b/odex25_base/mpl_login_background/controllers/main.py
@@ -98,6 +98,7 @@ class Home(http.Controller):
         background = param_obj.get_param('mpl_login_background.background')
         values['background_color'] = param_obj.get_param('mpl_login_background.color')
         b_image = param_obj.get_param('mpl_login_background.b_image')
+        values['reset_password_enabled'] = param_obj.get_param('auth_signup.reset_password') == 'True'
 
         if background == 'image':
             image_url = ''
diff --git a/odex25_base/mpl_login_background/templates/left_login_template.xml b/odex25_base/mpl_login_background/templates/left_login_template.xml
index 1670510fa..1a6dd59f1 100644
--- a/odex25_base/mpl_login_background/templates/left_login_template.xml
+++ b/odex25_base/mpl_login_background/templates/left_login_template.xml
@@ -60,6 +60,9 @@
 
                 <div t-attf-class="clearfix oe_login_buttons text-center mb-1 {{'pt-2' if form_small else 'pt-3'}}">
                     <button type="submit" class="btn btn-primary btn-block">Log in</button>
+                    <t t-if="reset_password_enabled">
+                        <a t-attf-href="/web/reset_password?{{ keep_query() }}" class="btn btn-secondary btn-block">Reset Password</a>
+                    </t>
                     <t t-if="debug">
                         <button type="submit" name="redirect" value="/web/become" class="btn btn-link btn-sm btn-block">Log in as superuser</button>
                     </t>
diff --git a/odex25_base/mpl_login_background/templates/middle_login_template.xml b/odex25_base/mpl_login_background/templates/middle_login_template.xml
index 5e161703d..9ebac607d 100644
--- a/odex25_base/mpl_login_background/templates/middle_login_template.xml
+++ b/odex25_base/mpl_login_background/templates/middle_login_template.xml
@@ -64,6 +64,9 @@
 
                 <div t-attf-class="clearfix oe_login_buttons text-center mb-1 {{'pt-2' if form_small else 'pt-3'}}">
                     <button type="submit" class="btn btn-primary btn-block">Log in</button>
+                    <t t-if="reset_password_enabled">
+                        <a t-attf-href="/web/reset_password?{{ keep_query() }}" class="btn btn-secondary btn-block">Reset Password</a>
+                    </t>
                     <t t-if="debug">
                         <button type="submit" name="redirect" value="/web/become" class="btn btn-link btn-sm btn-block">Log in as superuser</button>
                     </t>
diff --git a/odex25_base/mpl_login_background/templates/right_login_template.xml b/odex25_base/mpl_login_background/templates/right_login_template.xml
index 9a8006c50..fa4cc8c04 100644
--- a/odex25_base/mpl_login_background/templates/right_login_template.xml
+++ b/odex25_base/mpl_login_background/templates/right_login_template.xml
@@ -60,6 +60,9 @@
 
                 <div t-attf-class="clearfix oe_login_buttons text-center mb-1 {{'pt-2' if form_small else 'pt-3'}}">
                     <button type="submit" class="btn btn-primary btn-block">Log in</button>
+                    <t t-if="reset_password_enabled">
+                        <a t-attf-href="/web/reset_password?{{ keep_query() }}" class="btn btn-secondary btn-block">Reset Password</a>
+                    </t>
                     <t t-if="debug">
                         <button type="submit" name="redirect" value="/web/become" class="btn btn-link btn-sm btn-block">Log in as superuser</button>
                     </t>
diff --git a/odex25_base/odex25_apps_features/wizard/base_module_uninstall.py b/odex25_base/odex25_apps_features/wizard/base_module_uninstall.py
index 8e96435c8..5ded8e799 100644
--- a/odex25_base/odex25_apps_features/wizard/base_module_uninstall.py
+++ b/odex25_base/odex25_apps_features/wizard/base_module_uninstall.py
@@ -10,10 +10,10 @@ class BaseModuleUninstall(models.TransientModel):
 
     is_restrict = fields.Boolean()
     password = fields.Char(required=True)
-
-    def action_uninstall(self):
-        if not tools.config.get('uninstall_password'):
-            raise ValidationError("Uninstall password not yet set!")
-        if self.password != tools.config.get('uninstall_password').replace('\'', ''):
-            raise ValidationError("Invalid Password!")
-        return super(BaseModuleUninstall, self).action_uninstall()
+    #
+    # def action_uninstall(self):
+    #     if not tools.config.get('uninstall_password'):
+    #         raise ValidationError("Uninstall password not yet set!")
+    #     if self.password != tools.config.get('uninstall_password').replace('\'', ''):
+    #         raise ValidationError("Invalid Password!")
+    #     return super(BaseModuleUninstall, self).action_uninstall()