diff --git a/media/com_redshop/js/redshop.registration.js b/media/com_redshop/js/redshop.registration.js
index b4644cdaba3..2eb28e537db 100644
--- a/media/com_redshop/js/redshop.registration.js
+++ b/media/com_redshop/js/redshop.registration.js
@@ -99,7 +99,12 @@ if (typeof(window['jQuery']) != "undefined") {
                     number: true
                 },
                 email1: {
-                    email: true
+                    email: true,
+                    required: function() {
+                        emailString = rs("input[name='email1']").val();
+                        emailStringTrim = trim(emailString);
+                        rs("input[name='email1']").val(emailStringTrim);
+                    }
                 },
                 email2: {
                     required: true,
@@ -200,17 +205,17 @@ if (typeof(window['jQuery']) != "undefined") {
                     number: Joomla.JText._('COM_REDSHOP_EAN_MIN_CHARACTER_LIMIT')
                 }
             },
-           /* invalidHandler: function(e,validator) {
-                //validator.errorList contains an array of objects, where each object has properties "element" and "message".  element is the actual HTML Input.
-                for (var i=0;i<validator.errorList.length;i++){
-                    console.log(validator.errorList[i]);
-                }
+            /* invalidHandler: function(e,validator) {
+                 //validator.errorList contains an array of objects, where each object has properties "element" and "message".  element is the actual HTML Input.
+                 for (var i=0;i<validator.errorList.length;i++){
+                     console.log(validator.errorList[i]);
+                 }
 
-                //validator.errorMap is an object mapping input names -> error messages
-                for (var i in validator.errorMap) {
-                    console.log(i, ":", validator.errorMap[i]);
-                }
-            },*/
+                 //validator.errorMap is an object mapping input names -> error messages
+                 for (var i in validator.errorMap) {
+                     console.log(i, ":", validator.errorMap[i]);
+                 }
+             },*/
 
             focusInvalid: false,
             invalidHandler: function (form, validator) {
diff --git a/media/com_redshop/js/redshop.registration.min.js b/media/com_redshop/js/redshop.registration.min.js
index 99be414e268..fd827155ffd 100644
--- a/media/com_redshop/js/redshop.registration.min.js
+++ b/media/com_redshop/js/redshop.registration.min.js
@@ -1 +1 @@
-if(void 0!==window.jQuery){var rss=jQuery.noConflict(),rs=jQuery.noConflict();rs().ready(function(){!function(){for(var e,_=[],r=window.location.href.slice(window.location.href.indexOf("?")+1).split("&"),t=0;t<r.length;t++)e=r[t].split("="),_.push(e[0]),_[e[0]]=e[1]}();rs.validator.addMethod("phone",function(e,_){return e=e.replace(/\s+/g,""),this.optional(_)||e.match(/^[-+.() 0-9]+$/)},Joomla.JText._("COM_REDSHOP_YOUR_MUST_PROVIDE_A_VALID_PHONE")),rs.validator.addMethod("zipcodeValidation",function(e,_){return this.optional(_)||/^\d{4} ?[a-z]{2}$/i.test(e)||e.match(/(^\d{6}?$)|(^\d{5}?$)|(^\d{7}?$)|(^\d{4}?$)|(^\d{3}?$)|(^\d{8}?$)|(^\d{9}?$)|[A-Z]{1,2}\d[\dA-Z]?\s?\d[A-Z]{2}$/i)||e.match(/^[A-Z][0-9][A-Z].[0-9][A-Z][0-9]$/)||e.match(/^[A-Z][0-9][A-Z][0-9][A-Z][0-9]$/i)||e.match(/^[0-9]{5}$/)||e.match(/^[0-9]{2,2}\s[0-9]{3,3}$/)||e.match(/^[0-9]{3,3}\s[0-9]{2,2}$/)||e.match(/^[0-9]{4,4}-[0-9]{3,3}$/)||e.match(/^[0-9]{3,3}-[0-9]{2,2}$/)||e.match(/^[0-9]{2,2}-[0-9]{3,3}$/)||e.match(/^[A-Za-z0-9 _]*[A-Za-z0-9][A-Za-z0-9 _]*$/)},Joomla.JText._("COM_REDSHOP_YOUR_MUST_PROVIDE_A_ZIP")),rs.validator.messages.required=Joomla.JText._("COM_REDSHOP_THIS_FIELD_IS_REQUIRED"),rs("#adminForm").validate({onkeyup:!1,rules:{firstname:"required",lastname:"required",username:{required:function(){return rs("#createaccount")&&rs("#createaccount").is(":checked")||!rs("#createaccount").length&&rs("#username").length},minlength:2,remote:{url:"index.php?tmpl=component&option=com_redshop&view=registration&task=ajaxValidateNewJoomlaUser",type:"post",data:{username:function(){return rs("#adminForm input[name='username']").val()}},async:!1}},company_name:{required:function(){return rs("#toggler2").is(":checked")}},address:{required:function(){return 1==redSHOP.RSConfig._("REQUIRED_ADDRESS")}},vat_number:{required:function(){return rs("#toggler2").is(":checked")&&1==redSHOP.RSConfig._("REQUIRED_VAT_NUMBER")}},country_code:{required:function(){return rs("#div_country_txt")&&rs("#div_country_txt").is(":visible")&&1==redSHOP.RSConfig._("REQUIRED_COUNTRY_CODE")}},state_code:{required:function(){return rs("#div_state_txt")&&rs("#div_state_txt").is(":visible")}},ean_number:{required:function(){return rs("#toggler2").is(":checked")&&0<rs("#ean_number").length&&1==redSHOP.RSConfig._("REQUIRED_EAN_NUMBER")},minlength:13,maxlength:13,decimal:!1,negative:!1,number:!0},email1:{email:!0},email2:{required:!0,equalTo:"[name=email1]:visible"},password1:{required:function(){return rs("#createaccount")&&rs("#createaccount").is(":checked")||rs("#user_id")&&0==rs("#user_id").val()&&rs("#password1")||!rs("#createaccount").length&&rs("#password1").length},minlength:5},password2:{required:function(){return rs("#createaccount")&&rs("#createaccount").is(":checked")||rs("#user_id")&&0==rs("#user_id").val()&&rs("#password2")||!rs("#createaccount").length&&rs("#password2").length},minlength:5,equalTo:"#password1"},topic:{required:"#newsletter:checked",minlength:2},zipcode:{zipcodeValidation:!0,required:1==redSHOP.RSConfig._("REQUIRED_POSTAL_CODE")},phone:{required:function(){return rs("input[name='phone']")&&rs("input[name='phone']").is(":visible")&&1==redSHOP.RSConfig._("REQUIRED_PHONE")}},country_code_ST:{required:function(){return rs("#div_country_st_txt")&&rs("#div_country_st_txt").is(":visible")}},phone_ST:{required:function(){return rs("input[name='phone_ST']")&&rs("input[name='phone_ST']").is(":visible")}},termscondition:{required:function(){return rs("#termscondition")&&rs("#termscondition").is(":visible")}},agree:"required"},ignore:"#adminForm input:not(:visible)",messages:{company_name:Joomla.JText._("COM_REDSHOP_PLEASE_ENTER_COMPANY_NAME"),firstname:Joomla.JText._("COM_REDSHOP_YOUR_MUST_PROVIDE_A_FIRSTNAME"),lastname:Joomla.JText._("COM_REDSHOP_YOUR_MUST_PROVIDE_A_LASTNAME"),address:Joomla.JText._("COM_REDSHOP_YOUR_MUST_PROVIDE_A_ADDRESS"),country_code:Joomla.JText._("COM_REDSHOP_PLEASE_SELECT_COUNTRY"),zipcode:Joomla.JText._("COM_REDSHOP_YOUR_MUST_PROVIDE_A_ZIP"),city:Joomla.JText._("COM_REDSHOP_YOUR_MUST_PROVIDE_A_CITY"),phone:Joomla.JText._("COM_REDSHOP_YOUR_MUST_PROVIDE_A_VALID_PHONE"),firstname_ST:Joomla.JText._("COM_REDSHOP_YOUR_MUST_PROVIDE_A_FIRSTNAME"),lastname_ST:Joomla.JText._("COM_REDSHOP_YOUR_MUST_PROVIDE_A_LASTNAME"),address_ST:Joomla.JText._("COM_REDSHOP_YOUR_MUST_PROVIDE_A_ADDRESS"),country_code_ST:Joomla.JText._("COM_REDSHOP_PLEASE_SELECT_COUNTRY"),zipcode_ST:Joomla.JText._("COM_REDSHOP_YOUR_MUST_PROVIDE_A_ZIP"),city_ST:Joomla.JText._("COM_REDSHOP_YOUR_MUST_PROVIDE_A_CITY"),phone_ST:Joomla.JText._("COM_REDSHOP_YOUR_MUST_PROVIDE_A_VALID_PHONE"),username:{required:Joomla.JText._("COM_REDSHOP_YOU_MUST_PROVIDE_LOGIN_NAME"),minlength:Joomla.JText._("COM_REDSHOP_USERNAME_MIN_CHARACTER_LIMIT"),remote:Joomla.JText._("COM_REDSHOP_USERNAME_ALREADY_EXISTS")},email1:{required:Joomla.JText._("COM_REDSHOP_PROVIDE_EMAIL_ADDRESS")},email2:{required:Joomla.JText._("COM_REDSHOP_PROVIDE_EMAIL_ADDRESS"),equalTo:Joomla.JText._("COM_REDSHOP_EMAIL_NOT_MATCH")},password1:{required:Joomla.JText._("COM_REDSHOP_PLEASE_ENTER_PASSWORD"),minlength:Joomla.JText._("COM_REDSHOP_PASSWORD_MIN_CHARACTER_LIMIT")},password2:{required:Joomla.JText._("COM_REDSHOP_PLEASE_ENTER_PASSWORD"),minlength:Joomla.JText._("COM_REDSHOP_PASSWORD_MIN_CHARACTER_LIMIT"),equalTo:Joomla.JText._("COM_REDSHOP_PASSWORD_NOT_MATCH")},termscondition:Joomla.JText._("COM_REDSHOP_PLEASE_SELECT_TEMS_CONDITIONS"),agree:"Please accept our policy",ean_number:{minlength:Joomla.JText._("COM_REDSHOP_EAN_MIN_CHARACTER_LIMIT"),maxlength:Joomla.JText._("COM_REDSHOP_EAN_MIN_CHARACTER_LIMIT"),decimal:Joomla.JText._("COM_REDSHOP_EAN_MIN_CHARACTER_LIMIT"),negative:Joomla.JText._("COM_REDSHOP_EAN_MIN_CHARACTER_LIMIT"),number:Joomla.JText._("COM_REDSHOP_EAN_MIN_CHARACTER_LIMIT")}},focusInvalid:!1,invalidHandler:function(e,_){_.numberOfInvalids()&&rs("html").animate({scrollTop:rs(_.errorList[0].element).offset().top},200)}}),rs("#username").focus(function(){var e=rs("#firstname").val(),_=rs("#lastname").val();e&&_&&!this.value&&(this.value=e+"."+_)}),rs.validator.addMethod("billingRequired",function(e,_){return rs("#billisship").is(":checked")?rs(_).parents(".subTable").length:!this.optional(_)},"")})}
\ No newline at end of file
+if(void 0!==window.jQuery){var rss=jQuery.noConflict(),rs=jQuery.noConflict();rs().ready(function(){!function(){for(var e,_=[],r=window.location.href.slice(window.location.href.indexOf("?")+1).split("&"),t=0;t<r.length;t++)e=r[t].split("="),_.push(e[0]),_[e[0]]=e[1]}();rs.validator.addMethod("phone",function(e,_){return e=e.replace(/\s+/g,""),this.optional(_)||e.match(/^[-+.() 0-9]+$/)},Joomla.JText._("COM_REDSHOP_YOUR_MUST_PROVIDE_A_VALID_PHONE")),rs.validator.addMethod("zipcodeValidation",function(e,_){return this.optional(_)||/^\d{4} ?[a-z]{2}$/i.test(e)||e.match(/(^\d{6}?$)|(^\d{5}?$)|(^\d{7}?$)|(^\d{4}?$)|(^\d{3}?$)|(^\d{8}?$)|(^\d{9}?$)|[A-Z]{1,2}\d[\dA-Z]?\s?\d[A-Z]{2}$/i)||e.match(/^[A-Z][0-9][A-Z].[0-9][A-Z][0-9]$/)||e.match(/^[A-Z][0-9][A-Z][0-9][A-Z][0-9]$/i)||e.match(/^[0-9]{5}$/)||e.match(/^[0-9]{2,2}\s[0-9]{3,3}$/)||e.match(/^[0-9]{3,3}\s[0-9]{2,2}$/)||e.match(/^[0-9]{4,4}-[0-9]{3,3}$/)||e.match(/^[0-9]{3,3}-[0-9]{2,2}$/)||e.match(/^[0-9]{2,2}-[0-9]{3,3}$/)||e.match(/^[A-Za-z0-9 _]*[A-Za-z0-9][A-Za-z0-9 _]*$/)},Joomla.JText._("COM_REDSHOP_YOUR_MUST_PROVIDE_A_ZIP")),rs.validator.messages.required=Joomla.JText._("COM_REDSHOP_THIS_FIELD_IS_REQUIRED"),rs("#adminForm").validate({onkeyup:!1,rules:{firstname:"required",lastname:"required",username:{required:function(){return rs("#createaccount")&&rs("#createaccount").is(":checked")||!rs("#createaccount").length&&rs("#username").length},minlength:2,remote:{url:"index.php?tmpl=component&option=com_redshop&view=registration&task=ajaxValidateNewJoomlaUser",type:"post",data:{username:function(){return rs("#adminForm input[name='username']").val()}},async:!1}},company_name:{required:function(){return rs("#toggler2").is(":checked")}},address:{required:function(){return 1==redSHOP.RSConfig._("REQUIRED_ADDRESS")}},vat_number:{required:function(){return rs("#toggler2").is(":checked")&&1==redSHOP.RSConfig._("REQUIRED_VAT_NUMBER")}},country_code:{required:function(){return rs("#div_country_txt")&&rs("#div_country_txt").is(":visible")&&1==redSHOP.RSConfig._("REQUIRED_COUNTRY_CODE")}},state_code:{required:function(){return rs("#div_state_txt")&&rs("#div_state_txt").is(":visible")}},ean_number:{required:function(){return rs("#toggler2").is(":checked")&&0<rs("#ean_number").length&&1==redSHOP.RSConfig._("REQUIRED_EAN_NUMBER")},minlength:13,maxlength:13,decimal:!1,negative:!1,number:!0},email1:{email:!0,required:function(){emailString=rs("input[name='email1']").val(),emailStringTrim=trim(emailString),rs("input[name='email1']").val(emailStringTrim)}},email2:{required:!0,equalTo:"[name=email1]:visible"},password1:{required:function(){return rs("#createaccount")&&rs("#createaccount").is(":checked")||rs("#user_id")&&0==rs("#user_id").val()&&rs("#password1")||!rs("#createaccount").length&&rs("#password1").length},minlength:5},password2:{required:function(){return rs("#createaccount")&&rs("#createaccount").is(":checked")||rs("#user_id")&&0==rs("#user_id").val()&&rs("#password2")||!rs("#createaccount").length&&rs("#password2").length},minlength:5,equalTo:"#password1"},topic:{required:"#newsletter:checked",minlength:2},zipcode:{zipcodeValidation:!0,required:1==redSHOP.RSConfig._("REQUIRED_POSTAL_CODE")},phone:{required:function(){return rs("input[name='phone']")&&rs("input[name='phone']").is(":visible")&&1==redSHOP.RSConfig._("REQUIRED_PHONE")}},country_code_ST:{required:function(){return rs("#div_country_st_txt")&&rs("#div_country_st_txt").is(":visible")}},phone_ST:{required:function(){return rs("input[name='phone_ST']")&&rs("input[name='phone_ST']").is(":visible")}},termscondition:{required:function(){return rs("#termscondition")&&rs("#termscondition").is(":visible")}},agree:"required"},ignore:"#adminForm input:not(:visible)",messages:{company_name:Joomla.JText._("COM_REDSHOP_PLEASE_ENTER_COMPANY_NAME"),firstname:Joomla.JText._("COM_REDSHOP_YOUR_MUST_PROVIDE_A_FIRSTNAME"),lastname:Joomla.JText._("COM_REDSHOP_YOUR_MUST_PROVIDE_A_LASTNAME"),address:Joomla.JText._("COM_REDSHOP_YOUR_MUST_PROVIDE_A_ADDRESS"),country_code:Joomla.JText._("COM_REDSHOP_PLEASE_SELECT_COUNTRY"),zipcode:Joomla.JText._("COM_REDSHOP_YOUR_MUST_PROVIDE_A_ZIP"),city:Joomla.JText._("COM_REDSHOP_YOUR_MUST_PROVIDE_A_CITY"),phone:Joomla.JText._("COM_REDSHOP_YOUR_MUST_PROVIDE_A_VALID_PHONE"),firstname_ST:Joomla.JText._("COM_REDSHOP_YOUR_MUST_PROVIDE_A_FIRSTNAME"),lastname_ST:Joomla.JText._("COM_REDSHOP_YOUR_MUST_PROVIDE_A_LASTNAME"),address_ST:Joomla.JText._("COM_REDSHOP_YOUR_MUST_PROVIDE_A_ADDRESS"),country_code_ST:Joomla.JText._("COM_REDSHOP_PLEASE_SELECT_COUNTRY"),zipcode_ST:Joomla.JText._("COM_REDSHOP_YOUR_MUST_PROVIDE_A_ZIP"),city_ST:Joomla.JText._("COM_REDSHOP_YOUR_MUST_PROVIDE_A_CITY"),phone_ST:Joomla.JText._("COM_REDSHOP_YOUR_MUST_PROVIDE_A_VALID_PHONE"),username:{required:Joomla.JText._("COM_REDSHOP_YOU_MUST_PROVIDE_LOGIN_NAME"),minlength:Joomla.JText._("COM_REDSHOP_USERNAME_MIN_CHARACTER_LIMIT"),remote:Joomla.JText._("COM_REDSHOP_USERNAME_ALREADY_EXISTS")},email1:{required:Joomla.JText._("COM_REDSHOP_PROVIDE_EMAIL_ADDRESS")},email2:{required:Joomla.JText._("COM_REDSHOP_PROVIDE_EMAIL_ADDRESS"),equalTo:Joomla.JText._("COM_REDSHOP_EMAIL_NOT_MATCH")},password1:{required:Joomla.JText._("COM_REDSHOP_PLEASE_ENTER_PASSWORD"),minlength:Joomla.JText._("COM_REDSHOP_PASSWORD_MIN_CHARACTER_LIMIT")},password2:{required:Joomla.JText._("COM_REDSHOP_PLEASE_ENTER_PASSWORD"),minlength:Joomla.JText._("COM_REDSHOP_PASSWORD_MIN_CHARACTER_LIMIT"),equalTo:Joomla.JText._("COM_REDSHOP_PASSWORD_NOT_MATCH")},termscondition:Joomla.JText._("COM_REDSHOP_PLEASE_SELECT_TEMS_CONDITIONS"),agree:"Please accept our policy",ean_number:{minlength:Joomla.JText._("COM_REDSHOP_EAN_MIN_CHARACTER_LIMIT"),maxlength:Joomla.JText._("COM_REDSHOP_EAN_MIN_CHARACTER_LIMIT"),decimal:Joomla.JText._("COM_REDSHOP_EAN_MIN_CHARACTER_LIMIT"),negative:Joomla.JText._("COM_REDSHOP_EAN_MIN_CHARACTER_LIMIT"),number:Joomla.JText._("COM_REDSHOP_EAN_MIN_CHARACTER_LIMIT")}},focusInvalid:!1,invalidHandler:function(e,_){_.numberOfInvalids()&&rs("html").animate({scrollTop:rs(_.errorList[0].element).offset().top},200)}}),rs("#username").focus(function(){var e=rs("#firstname").val(),_=rs("#lastname").val();e&&_&&!this.value&&(this.value=e+"."+_)}),rs.validator.addMethod("billingRequired",function(e,_){return rs("#billisship").is(":checked")?rs(_).parents(".subTable").length:!this.optional(_)},"")})}
\ No newline at end of file
diff --git a/src/assets/com_redshop/js/redshop.registration.js b/src/assets/com_redshop/js/redshop.registration.js
index b4644cdaba3..2eb28e537db 100644
--- a/src/assets/com_redshop/js/redshop.registration.js
+++ b/src/assets/com_redshop/js/redshop.registration.js
@@ -99,7 +99,12 @@ if (typeof(window['jQuery']) != "undefined") {
                     number: true
                 },
                 email1: {
-                    email: true
+                    email: true,
+                    required: function() {
+                        emailString = rs("input[name='email1']").val();
+                        emailStringTrim = trim(emailString);
+                        rs("input[name='email1']").val(emailStringTrim);
+                    }
                 },
                 email2: {
                     required: true,
@@ -200,17 +205,17 @@ if (typeof(window['jQuery']) != "undefined") {
                     number: Joomla.JText._('COM_REDSHOP_EAN_MIN_CHARACTER_LIMIT')
                 }
             },
-           /* invalidHandler: function(e,validator) {
-                //validator.errorList contains an array of objects, where each object has properties "element" and "message".  element is the actual HTML Input.
-                for (var i=0;i<validator.errorList.length;i++){
-                    console.log(validator.errorList[i]);
-                }
+            /* invalidHandler: function(e,validator) {
+                 //validator.errorList contains an array of objects, where each object has properties "element" and "message".  element is the actual HTML Input.
+                 for (var i=0;i<validator.errorList.length;i++){
+                     console.log(validator.errorList[i]);
+                 }
 
-                //validator.errorMap is an object mapping input names -> error messages
-                for (var i in validator.errorMap) {
-                    console.log(i, ":", validator.errorMap[i]);
-                }
-            },*/
+                 //validator.errorMap is an object mapping input names -> error messages
+                 for (var i in validator.errorMap) {
+                     console.log(i, ":", validator.errorMap[i]);
+                 }
+             },*/
 
             focusInvalid: false,
             invalidHandler: function (form, validator) {