Crabtree/SmartHome/UI/SimpleControl/Phone/Register/AccountRegistration.cs
@@ -226,8 +226,8 @@
            };
            btnOK.MouseUpEventHandler += (sender, e) => {
                var reg = new Regex ("^\\s*([A-Za-z0-9_-]+(\\.\\w+)*@(\\w+\\.)+\\w{2,5})\\s*$");
                var ss = reg.Match (etEmailAddress.Text);
                //var reg = new Regex ("^\\s*([A-Za-z0-9_-]+(\\.\\w+)*@(\\w+\\.)+\\w{2,5})\\s*$");
                //var ss = reg.Match (etEmailAddress.Text);
                string account = etEmailAddress.Text.Trim ();
                string passwordText = etPasswrod.Text.Trim ();
@@ -240,16 +240,21 @@
                } else if (regName.Match (userName).Success) {
                    new Alert ("", "Protect Your Illegal Characters in Name", Language.StringByID (R.MyInternationalizationString.Close)).Show ();
                    return;
                } else if (!ss.Success) {
                } else if (!CommonUtlis.Current.CheckEmail (account)) {
                    new Alert ("", Language.StringByID (R.MyInternationalizationString.PleaseCheckEmailAddressCorrectly),
                                                       Language.StringByID (R.MyInternationalizationString.Close)).Show ();
                    return;
                } else if (etPasswrod.Text.Trim ().Length < 6) {
                    new Alert ("", Language.StringByID (R.MyInternationalizationString.PasswordLenghtTip), Language.StringByID (R.MyInternationalizationString.Close)).Show ();
                    return;
                } else if (etPasswrod.Text == "" && etConfirmPassword.Text == "") {
                }
                if (etPasswrod.Text == "" && etConfirmPassword.Text == "") {
                    new Alert ("", Language.StringByID (R.MyInternationalizationString.PleaseWriteTheCompleteContent), Language.StringByID (R.MyInternationalizationString.Close)).Show ();
                    return;
                } else if (!CommonUtlis.Current.CheckPassword(etPasswrod.Text.Trim ())) {
                    new Alert ("", ErrorCode.PasswordStrengthNotMatch,
                               Language.StringByID (R.MyInternationalizationString.Close)).Show ();
                    return;
                } else if (etPasswrod.Text.Trim () != etConfirmPassword.Text.Trim ()) {
                    new Alert ("", Language.StringByID (R.MyInternationalizationString.RepeatPasswordsDidNotmatch),
                               Language.StringByID (R.MyInternationalizationString.Close)).Show ();