diff --git a/system/controllers/customers.php b/system/controllers/customers.php
index e4981ece..8e727740 100644
--- a/system/controllers/customers.php
+++ b/system/controllers/customers.php
@@ -360,7 +360,7 @@ switch ($action) {
         break;
 
     case 'add-post':
-        $username = alphanumeric(_post('username'), "+_.");
+        $username = alphanumeric(_post('username'), "+_.@");
         $fullname = _post('fullname');
         $password = trim(_post('password'));
         $pppoe_password = trim(_post('pppoe_password'));
@@ -439,7 +439,7 @@ switch ($action) {
         break;
 
     case 'edit-post':
-        $username = alphanumeric(_post('username'), "+_.");
+        $username = alphanumeric(_post('username'), "+_.@");
         $fullname = _post('fullname');
         $account_type = _post('account_type');
         $password = trim(_post('password'));
diff --git a/system/controllers/login.php b/system/controllers/login.php
index cc26883d..8dd3aba3 100644
--- a/system/controllers/login.php
+++ b/system/controllers/login.php
@@ -64,7 +64,7 @@ switch ($do) {
             $user = ORM::for_table('tbl_customers')->where('username', $username)->find_one();
             if (!$user) {
                 $d = ORM::for_table('tbl_customers')->create();
-                $d->username = alphanumeric($username, "+_.");
+                $d->username = alphanumeric($username, "+_.@");
                 $d->password = $voucher;
                 $d->fullname = '';
                 $d->address = '';
diff --git a/system/controllers/register.php b/system/controllers/register.php
index 9ab440a0..39fee616 100644
--- a/system/controllers/register.php
+++ b/system/controllers/register.php
@@ -16,7 +16,7 @@ $otpPath = $CACHE_PATH . File::pathFixer('/sms/');
 switch ($do) {
     case 'post':
         $otp_code = _post('otp_code');
-        $username = alphanumeric(_post('username'), "+_.");
+        $username = alphanumeric(_post('username'), "+_.@");
         $email = _post('email');
         $fullname = _post('fullname');
         $password = _post('password');
@@ -78,7 +78,7 @@ switch ($do) {
         if ($msg == '') {
             run_hook('register_user'); #HOOK
             $d = ORM::for_table('tbl_customers')->create();
-            $d->username = alphanumeric($username, "+_.");
+            $d->username = alphanumeric($username, "+_.@");
             $d->password = $password;
             $d->fullname = $fullname;
             $d->address = $address;