diff --git a/secure_uninstall/module.py b/secure_uninstall/module.py
index d90b1e052..cfe451f26 100644
--- a/secure_uninstall/module.py
+++ b/secure_uninstall/module.py
@@ -28,11 +28,14 @@ class Module(orm.Model):
 
     def button_uninstall(self, cr, uid, ids, context=None):
         if 'uninstall_authorized' in context:
-            del context['uninstall_authorized']
+            if not context:
+                context = {}
+            ctx = context.copy()
+            del ctx['uninstall_authorized']
             super(Module, self).button_uninstall(
-                cr, uid, ids, context=context)
+                cr, uid, ids, context=ctx)
             return self._button_immediate_function(
-                cr, uid, ids, self.button_uninstall, context=context)
+                cr, uid, ids, self.button_uninstall, context=ctx)
         else:
             _, view_id = self.pool['ir.model.data'].get_object_reference(
                 cr, uid, 'secure_uninstall', 'view_uninstall_wizard_form')
@@ -69,7 +72,7 @@ class UninstallCheckWizard(orm.TransientModel):
                 raise orm.except_orm(
                     "Password Error",
                     "Issue\n_____\nProvided password '%s' doesn't match with "
-                    "'admin_passwd' comes from your "
+                    "'admin_passwd' found in the "
                     "Odoo server configuration file."
                     "\n\nResolution\n__________\n"
                     "Please check your password and retry or cancel"
diff --git a/secure_uninstall/wizard_view.xml b/secure_uninstall/wizard_view.xml
index 141fbd628..79d134003 100644
--- a/secure_uninstall/wizard_view.xml
+++ b/secure_uninstall/wizard_view.xml
@@ -9,7 +9,8 @@
     <field name="arch" type="xml">
         <form string="Check" version="7.0">
             <p class="oe_inline oe_grey">
-Uninstall module process remove all data managed by the module.
+Uninstall module process remove all data managed by the module.<br/>
+Some columns can be dropped and there is no way to recover that except restoring a database backup
             </p>
             <label string="If you want uninstall module, write required password."
                    colspan="4" />
@@ -17,8 +18,11 @@ Uninstall module process remove all data managed by the module.
                 <field name="password" password="True"/>
                 <span/>
             </group>
-            <button icon="gtk-ok" name="check_password" string="Apply" type="object"/>
-            <button icon="gtk-cancel" special="cancel" string="Cancel"/>
+            <footer>
+                <button name="check_password" string="Apply" type="object"
+                        class="oe_highlight"/>
+                <button special="cancel" string="Cancel" class="oe_link"/>
+            </footer>
         </form>
     </field>
 </record>