diff --git a/src/admin/member_do.php b/src/admin/member_do.php
index 0971a58e..e377dafb 100644
--- a/src/admin/member_do.php
+++ b/src/admin/member_do.php
@@ -155,7 +155,7 @@ else if ($dopost == 'edituser') {
     if (empty($sex)) $sex = '男';
     $uptime = GetMkTime($uptime);
     if ($matt == 10 && $oldmatt != 10) {
-        ShowMsg("不支持直接把前台会员转为管理的操作", "-1");
+        ShowMsg("不支持前台会员转为管理员", "-1");
         exit();
     }
     $query = "UPDATE `#@__member` SET send_max='$send_max',email='$email',uname='$uname',sex='$sex',matt='$matt',user_money='$user_money',money='$money',scores='$scores',`rank`='$rank',spacesta='$spacesta',uptime='$uptime',exptime='$exptime'$pwdsql WHERE mid='$id' AND matt<>10 ";
diff --git a/src/admin/member_toadmin.php b/src/admin/member_toadmin.php
index 3971dc10..1e14f4ad 100644
--- a/src/admin/member_toadmin.php
+++ b/src/admin/member_toadmin.php
@@ -65,7 +65,7 @@ if ($dopost == "toadmin") {
         $query = "INSERT INTO `#@__admin` (id,userid$inputpwd,uname,typeid,tname,email) VALUES ('$id','$userid'$inputpwdv,'$uname','$typeid','$tname','$email')";
     }
     $dsql->ExecuteNoneQuery($query);
-    $query = "UPDATE `#@__member` SET `rank`='100',uname='$uname',matt='10',email='$email'$pwdm WHERE mid='$id'";
+    $query = "UPDATE `#@__member` SET `rank`='100',uname='$uname',matt='10',email='$email' $pwdm WHERE mid='$id'";
     $dsql->ExecuteNoneQuery($query);
     $row = $dsql->GetOne("SELECT * FROM `#@__admintype` WHERE `rank`='$usertype'");
     $floginid = $cuserLogin->getUserName();
diff --git a/src/admin/sys_admin_user_edit.php b/src/admin/sys_admin_user_edit.php
index 3e4252a5..7894db69 100644
--- a/src/admin/sys_admin_user_edit.php
+++ b/src/admin/sys_admin_user_edit.php
@@ -67,7 +67,7 @@ if ($dopost == 'saveedit') {
         $query = "UPDATE `#@__admin` SET uname='$uname',tname='$tname',email='$email',typeid='$typeid' $pwd $usql WHERE id='$id'";
     }
     $dsql->ExecuteNoneQuery($query);
-    $query = "UPDATE `#@__member` SET uname='$uname',email='$email'$pwdm $usql WHERE mid='$id'";
+    $query = "UPDATE `#@__member` SET uname='$uname',email='$email' $pwdm $usql WHERE mid='$id'";
     $dsql->ExecuteNoneQuery($query);
     ShowMsg("成功修改一个账户", "sys_admin_user.php");
     exit();
diff --git a/src/admin/templets/member_edit.htm b/src/admin/templets/member_edit.htm
index a4c3ada6..3f228496 100644
--- a/src/admin/templets/member_edit.htm
+++ b/src/admin/templets/member_edit.htm
@@ -43,7 +43,7 @@
 									</tr>
 									<tr>
 										<td>密码</td>
-										<td><input type="text" name="pwd" id="pwd" class="admin-input-sm">（留空则不修改，请使用数字0-9小写a-z大写A-Z符号_@!.-）</td>
+										<td><input type="text" name="pwd" id="pwd" class="admin-input-sm" onkeyup="this.value=this.value.replace(/[^0-9a-zA-Z_@!\.-]/g,'');">（留空则不修改，请使用数字0-9小写a-z大写A-Z符号_@!.-）</td>
 									</tr>
 									<tr>
 										<td>邮箱</td>
diff --git a/src/admin/templets/member_toadmin.htm b/src/admin/templets/member_toadmin.htm
index ecbda72d..f656c1a9 100644
--- a/src/admin/templets/member_toadmin.htm
+++ b/src/admin/templets/member_toadmin.htm
@@ -39,7 +39,7 @@
 									</tr>
 									<tr>
 										<td>密码</td>
-										<td><input type="text" name="pwd" id="pwd" class="admin-input-sm">（留空则不修改，请使用数字0-9小写a-z大写A-Z符号_@!.-）</td>
+										<td><input type="text" name="pwd" id="pwd" class="admin-input-sm" onkeyup="this.value=this.value.replace(/[^0-9a-zA-Z_@!\.-]/g,'');">（留空则不修改，请使用数字0-9小写a-z大写A-Z符号_@!.-）</td>
 									</tr>
 									<tr>
 										<td>类型</td>
diff --git a/src/admin/templets/sys_admin_user_add.htm b/src/admin/templets/sys_admin_user_add.htm
index 824dac41..14fa8d2a 100644
--- a/src/admin/templets/sys_admin_user_add.htm
+++ b/src/admin/templets/sys_admin_user_add.htm
@@ -29,7 +29,7 @@
 								<tbody>
 									<tr>
 										<td width="260">账号</td>
-										<td><input type="text" name="userid" id="userid" class="admin-input-sm" required>（请使用数字0-9小写a-z大写A-Z符号_@!.-）</td>
+										<td><input type="text" name="userid" id="userid" class="admin-input-sm" onkeyup="this.value=this.value.replace(/[^0-9a-zA-Z_@!\.-]/g,'');" required>（请使用数字0-9小写a-z大写A-Z符号_@!.-）</td>
 									</tr>
 									<tr>
 										<td>昵称</td>
@@ -37,7 +37,7 @@
 									</tr>
 									<tr>
 										<td>密码</td>
-										<td><input type="text" name="pwd" id="pwd" class="admin-input-sm" required>（请使用数字0-9小写a-z大写A-Z符号_@!.-）</td>
+										<td><input type="text" name="pwd" id="pwd" class="admin-input-sm" onkeyup="this.value=this.value.replace(/[^0-9a-zA-Z_@!\.-]/g,'');" required>（请使用数字0-9小写a-z大写A-Z符号_@!.-）</td>
 									</tr>
 									<tr>
 										<td>会员组</td>
@@ -71,7 +71,7 @@
 									</tr>
 									<tr>
 										<td>邮箱</td>
-										<td><input type="text" name="email" id="email" autocomplete="off" class="admin-input-sm" required></td>
+										<td><input type="text" name="email" id="email" autocomplete="off" class="admin-input-sm"></td>
 									</tr>
 									<tr>
 										<td>验证安全码</td>
diff --git a/src/admin/templets/sys_admin_user_edit.htm b/src/admin/templets/sys_admin_user_edit.htm
index ea0cc47a..dc854ac7 100644
--- a/src/admin/templets/sys_admin_user_edit.htm
+++ b/src/admin/templets/sys_admin_user_edit.htm
@@ -36,7 +36,7 @@
 									</tr>
 									<tr>
 										<td>密码</td>
-										<td><input type="text" name="pwd" id="pwd" class="admin-input-sm">（留空则不修改，请使用数字0-9小写a-z大写A-Z符号_@!.-）</td>
+										<td><input type="text" name="pwd" id="pwd" class="admin-input-sm" onkeyup="this.value=this.value.replace(/[^0-9a-zA-Z_@!\.-]/g,'');">（留空则不修改，请使用数字0-9小写a-z大写A-Z符号_@!.-）</td>
 									</tr>
 									<tr>
 										<td>类型</td>
@@ -70,7 +70,7 @@
 									</tr>
 									<tr>
 										<td>邮箱</td>
-										<td><input type="text" name="email" id="email" autocomplete="off" value="<?php echo $row['email']?>" class="admin-input-sm" required></td>
+										<td><input type="text" name="email" id="email" autocomplete="off" value="<?php echo $row['email']?>" class="admin-input-sm"></td>
 									</tr>
 									<tr>
 										<td>验证安全码</td>
diff --git a/src/user/templets/reg-new.htm b/src/user/templets/reg-new.htm
index d6841c33..10c31a86 100755
--- a/src/user/templets/reg-new.htm
+++ b/src/user/templets/reg-new.htm
@@ -21,7 +21,7 @@
 						<input type="hidden" name="pid" value="<?php echo $pid;?>">
 						<div class="form-group">
 							<label for="iptUserid">账号</label>
-							<input type="text" name="userid" id="iptUserid" class="form-control" placeholder="请输入账号" required>
+							<input type="text" name="userid" id="iptUserid" class="form-control" placeholder="请输入账号" onkeyup="this.value=this.value.replace(/[^0-9a-zA-Z_@!\.-]/g,'');" required>
 						</div>
 						<div class="form-group">
 							<label for="iptUserpwd">密码</label>