diff --git a/addons/website/models/website.py b/addons/website/models/website.py
index 6a47cfee840..629462b7c58 100644
--- a/addons/website/models/website.py
+++ b/addons/website/models/website.py
@@ -714,8 +714,9 @@ class Menu(models.Model):
         else:
             url = self.url
             if not self.url.startswith('/'):
-                if '@' in self.url and not self.url.startswith('mailto'):
-                    url = 'mailto:%s' % self.url
+                if '@' in self.url:
+                    if not self.url.startswith('mailto'):
+                        url = 'mailto:%s' % self.url
                 elif not self.url.startswith('http'):
                     url = '/%s' % self.url
         return url
diff --git a/addons/website/static/src/js/menu/content.js b/addons/website/static/src/js/menu/content.js
index cfc22c8bbee..4d2b430c867 100644
--- a/addons/website/static/src/js/menu/content.js
+++ b/addons/website/static/src/js/menu/content.js
@@ -261,11 +261,11 @@ var MenuEntryDialog = widget.LinkDialog.extend({
      */
     start: function () {
         var self = this;
-        self.$('#o_link_dialog_url_input').closest('.form-group').hide();
         this.$('.o_link_dialog_preview').remove();
         this.$('.window-new, .link-style').closest('.form-group').remove();
         this.$('label[for="o_link_dialog_label_input"]').text(_t("Menu Label"));
         if (this.menu_link_options) { // add menu link option only when adding new menu
+            self.$('#o_link_dialog_url_input').closest('.form-group').hide();
             this.$('#o_link_dialog_label_input').closest('.form-group').after(qweb.render('website.contentMenu.dialog.edit.link_menu_options'));
             // remove the label that is automatically added before
             this.$('#o_link_dialog_url_input').parent().siblings().html('');