diff --git a/CHANGELOG b/CHANGELOG
index b72092d539..868dca7b0d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,4 @@
+* Use appropriate types for email and url widgets
 * Add completion on xxx2Many and Dict
 * Add attachment preview
 * Support document widget
diff --git a/src/view/form.js b/src/view/form.js
index 9dac9a0457..f4a0fae230 100644
--- a/src/view/form.js
+++ b/src/view/form.js
@@ -4229,6 +4229,7 @@ function eval_pyson(value){
         class_: 'form-url',
         init: function(view, attributes) {
             Sao.View.Form.URL._super.init.call(this, view, attributes);
+            this.input.attr('type', 'url');
             this.button = jQuery('<a/>', {
                 'class': 'btn btn-default',
                 'target': '_blank',
@@ -4284,6 +4285,10 @@ function eval_pyson(value){
 
     Sao.View.Form.Email = Sao.class_(Sao.View.Form.URL, {
         class_: 'form-email',
+        init: function(view, attributes) {
+            Sao.View.Form.Email._super.init.call(this, view, attributes);
+            this.input.attr('type', 'email');
+        },
         set_url: function(value) {
             Sao.View.Form.Email._super.set_url.call(this, 'mailto:' + value);
         }