diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt
index f40024fb97..19ee4b5b76 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shareshelf.tt
@@ -44,7 +44,7 @@
 
     [% ELSIF op=='invite' %]
         <div id="invite">
-        <form method="post" onsubmit="return $.trim($('#invite_address').val())!='';">
+        <form id="share_list">
         <fieldset class="rows">
             <ol>
             <input type="hidden" name="op" value="conf_invite"/>
@@ -89,4 +89,17 @@
     </div> <!-- / .container-fluid -->
 </div> <!-- / .main -->
 [% INCLUDE 'opac-bottom.inc' %]
-[% BLOCK jsinclude %][% END %]
+[% BLOCK jsinclude %]
+<script type="text/javascript">
+//<![CDATA[
+    $(document).ready(function(){
+        $("#share_list").on('submit', function(e) {
+            var address = $("#invite_address").val();
+            if ( address.length == 0) {
+                e.preventDefault();
+            }
+        });
+    });
+//]]>
+</script>
+[% END %]
diff --git a/opac/opac-shareshelf.pl b/opac/opac-shareshelf.pl
index 669629b9cf..efae700e05 100755
--- a/opac/opac-shareshelf.pl
+++ b/opac/opac-shareshelf.pl
@@ -60,6 +60,12 @@ sub _init {
     $param->{fail_addr}   = [];
     $param->{errcode}     = check_common_errors($param);
 
+    # trim email address
+    if ( $param->{addrlist} ) {
+        $param->{addrlist} =~ s|^\s+||;
+        $param->{addrlist} =~ s|\s+$||;
+    }
+
     #get some list details
     my @temp;
     @temp = GetShelf( $param->{shelfnumber} ) if !$param->{errcode};