diff --git a/settings/js/personal.js b/settings/js/personal.js
index 010f0fc0a794faa047e775fe621f911018319d44..576a425ce528afbdfadd6d663cc5972d0a0dec62 100644
--- a/settings/js/personal.js
+++ b/settings/js/personal.js
@@ -164,6 +164,11 @@ $(document).ready(function(){
 
     $('#email').keyup(function(){
         if ($('#email').val() !== '' ){
+            // if this is the enter key changeEmailAddress() is already invoked
+            // so it doesn't need to be triggered again
+            if(event.keyCode === 13) {
+                return;
+            }
             if(typeof timeout !== 'undefined'){
                 clearTimeout(timeout);
             }