diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 3face47de52..682a2e06299 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -101,7 +101,7 @@
                 <form string="Events" version="7.0">
                     <header>
                         <button string="Confirm Event" name="button_confirm" states="draft" type="object" class="oe_highlight" groups="base.group_user"/>
-                        <button string="Event Ended" name="button_done" states="confirm" type="object" class="oe_highlight" groups="base.group_user"/>
+                        <button string="Finish Event" name="button_done" states="confirm" type="object" class="oe_highlight" groups="base.group_user"/>
                         <button string="Set To Draft" name="button_draft" states="cancel,done" type="object" groups="base.group_user"/>
                         <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" groups="base.group_user"/>
                         <field name="state" widget="statusbar" statusbar_visible="draft,confirm,done"/>
@@ -288,7 +288,7 @@
                             <t t-if="record.is_subscribed.raw_value">
                               <button type="object" name="unsubscribe_to_event" class="oe_unsubscribe_button ">
                                 <span>Subscribed</span>
-                                <span class="unsubscribe">Unsubscribe</span>
+                                <span class="oe_unsubscribe">Unsubscribe</span>
                               </button>
                             </t>
                         </div>
diff --git a/addons/event_moodle/wizard_moodle.xml b/addons/event_moodle/wizard_moodle.xml
index 8dbe5d485f9..7cc300521ce 100644
--- a/addons/event_moodle/wizard_moodle.xml
+++ b/addons/event_moodle/wizard_moodle.xml
@@ -23,7 +23,7 @@
                      <separator string="Connection with username and password" colspan="4"/>
                      <label string="Another approach is to create a user for OpenERP in Moodle. If you do so, make sure that this user has appropriate access rights." colspan="4"/>
                      <field name="moodle_username"/>
-                     <field name="moodle_password"/>
+                     <field name="moodle_password" password="True"/>
                     </group>
                 </form>
             </field>