From f77c96f3c3dbe02d41ba3e4c7618d412ebe37439 Mon Sep 17 00:00:00 2001
From: Ibnu Maksum <ibnumaksum@gmail.com>
Date: Wed, 3 Apr 2024 11:14:50 +0700
Subject: [PATCH] Change to Username if Country code empty

---
 CHANGELOG.md                |   5 +
 system/controllers/logs.php |  14 +-
 system/lan/english.json     | 622 ++++++------------------------------
 ui/ui/customers-add.tpl     |   9 +-
 ui/ui/customers-edit.tpl    |   7 +-
 ui/ui/logs-radius.tpl       |   4 +-
 ui/ui/logs.tpl              |   4 +-
 ui/ui/register-otp.tpl      |  44 +--
 ui/ui/register-rotp.tpl     |  42 +--
 ui/ui/register.tpl          |  49 +--
 ui/ui/user-login-noreg.tpl  |   7 +-
 ui/ui/user-login.tpl        |   7 +-
 version.json                |   2 +-
 13 files changed, 194 insertions(+), 622 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c184ab7d..1cc66a8b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 # CHANGELOG
 
+## 2024.4.3
+
+- Export logs to CSV by @agstrxyz
+- Change to Username if Country code empty
+
 ## 2024.4.2
 
 - Fix REST API
diff --git a/system/controllers/logs.php b/system/controllers/logs.php
index b85ca8d6..93b4c849 100644
--- a/system/controllers/logs.php
+++ b/system/controllers/logs.php
@@ -13,13 +13,12 @@ $action = $routes['1'];
 $ui->assign('_admin', $admin);
 
 if (!in_array($admin['user_type'], ['SuperAdmin', 'Admin'])) {
-    _alert(Lang::T('You do not have permission to access this page'),'danger', "dashboard");
+    _alert(Lang::T('You do not have permission to access this page'), 'danger', "dashboard");
 }
 
 
 switch ($action) {
-	    case 'list-csv':
-		
+    case 'list-csv':
         $logs = ORM::for_table('tbl_logs')
             ->select('id')
             ->select('date')
@@ -28,7 +27,6 @@ switch ($action) {
             ->select('userid')
             ->select('ip')
             ->order_by_asc('id')->find_array();
-			
         $h = false;
         set_time_limit(-1);
         header('Pragma: public');
@@ -51,10 +49,7 @@ switch ($action) {
             echo '"' . implode('";"', $vs) . "\"\n";
         }
         break;
-		
-		
-		case 'radius-csv':
-		
+    case 'radius-csv':
         $logs = ORM::for_table('radpostauth')
             ->select('id')
             ->select('username')
@@ -62,7 +57,6 @@ switch ($action) {
             ->select('reply')
             ->select('authdate')
             ->order_by_asc('id')->find_array();
-			
         $h = false;
         set_time_limit(-1);
         header('Pragma: public');
@@ -85,7 +79,7 @@ switch ($action) {
             echo '"' . implode('";"', $vs) . "\"\n";
         }
         break;
-		
+
     case 'list':
         $q = (_post('q') ? _post('q') : _get('q'));
         $keep = _post('keep');
diff --git a/system/lan/english.json b/system/lan/english.json
index 8d531a87..dbc7385c 100644
--- a/system/lan/english.json
+++ b/system/lan/english.json
@@ -1,543 +1,107 @@
 {
-    "Log_in": "Login",
-    "Register": "Register",
-    "Announcement": "Announcement",
-    "Registration_Info": "Registration Info",
-    "Voucher_not_found__please_buy_voucher_befor_register": "Voucher not found, please buy voucher befor register",
-    "Register_Success__You_can_login_now": "Register Success! You can login now",
-    "Log_in_to_Member_Panel": "Log in to Member Panel",
-    "Register_as_Member": "Register as Member",
-    "Enter_Admin_Area": "Enter Admin Area",
-    "PHPNuxBill": "PHPNuxBill",
-    "Username": "Username",
-    "Password": "Password",
-    "Passwords_does_not_match": "Passwords does not match",
-    "Account_already_axist": "Account already axist",
-    "Manage": "Manage",
-    "Submit": "Submit",
-    "Save_Changes": "Save Changes",
-    "Cancel": "Cancel",
-    "Edit": "Edit",
-    "Delete": "Delete",
-    "Welcome": "Welcome",
-    "Data_Created_Successfully": "Data Created Successfully",
-    "Data_Updated_Successfully": "Data Updated Successfully",
-    "Data_Deleted_Successfully": "Data Deleted Successfully",
-    "Static_Pages": "Static Pages",
-    "Failed_to_save_page__make_sure_i_can_write_to_folder_pages___i_chmod_664_pages___html_i_": "Failed to save page, make sure i can write to folder pages, <i>chmod 664 pages\/*.html<i>",
-    "Saving_page_success": "Saving page success",
-    "Sometimes_you_need_to_refresh_3_times_until_content_change": "Sometimes you need to refresh 3 times until content change",
-    "Dashboard": "Dashboard",
-    "Search_Customers___": "Search Customers...",
-    "My_Account": "My Account",
-    "My_Profile": "My Profile",
-    "Settings": "Settings",
-    "Edit_Profile": "Edit Profile",
-    "Change_Password": "Change Password",
-    "Logout": "Logout",
-    "Services": "Services",
-    "Bandwidth_Plans": "Bandwidth Plans",
-    "Bandwidth_Name": "Bandwidth Name",
-    "New_Bandwidth": "New Bandwidth",
-    "Edit_Bandwidth": "Edit Bandwidth",
-    "Add_New_Bandwidth": "Add New Bandwidth",
-    "Rate_Download": "Rate Download",
-    "Rate_Upload": "Rate Upload",
-    "Name_Bandwidth_Already_Exist": "Name Bandwidth Already Exist",
-    "Hotspot_Plans": "Hotspot Plans",
-    "PPPOE_Plans": "PPPOE Plans",
-    "Plan_Name": "Plan Name",
-    "New_Service_Plan": "New Service Plan",
-    "Add_Service_Plan": "Add Service Plan",
-    "Edit_Service_Plan": "Edit Service Plan",
-    "Name_Plan_Already_Exist": "Name Plan Already Exist",
-    "Plan_Type": "Plan Type",
-    "Plan_Price": "Plan Price",
-    "Limit_Type": "Limit Type",
-    "Unlimited": "Unlimited",
-    "Limited": "Limited",
-    "Time_Limit": "Time Limit",
-    "Data_Limit": "Data Limit",
-    "Both_Limit": "Both Limit",
-    "Plan_Validity": "Plan Validity",
-    "Select_Bandwidth": "Select Bandwidth",
-    "Shared_Users": "Shared Users",
-    "Choose_User_Type_Sales_to_disable_access_to_Settings": "Choose User Type Sales to disable access to Settings",
-    "Current_Password": "Current Password",
-    "New_Password": "New Password",
-    "Administrator": "Administrator",
-    "Sales": "Sales",
-    "Member": "Member",
-    "Confirm_New_Password": "Confirm New Password",
-    "Confirm_Password": "Confirm Password",
-    "Full_Name": "Full Name",
-    "User_Type": "User Type",
-    "Address": "Address",
-    "Created_On": "Created On",
-    "Expires_On": "Expires On",
-    "Phone_Number": "Phone Number",
-    "User_deleted_Successfully": "User deleted Successfully",
-    "Full_Administrator": "Full Administrator",
-    "Keep_Blank_to_do_not_change_Password": "Keep Blank to do not change Password",
-    "Keep_it_blank_if_you_do_not_want_to_show_currency_code": "Keep it blank if you do not want to show currency code",
-    "Theme_Style": "Theme Style",
-    "Theme_Color": "Theme Color",
-    "Default_Language": "Default Language",
-    "Network": "Network",
-    "Routers": "Routers",
-    "IP_Pool": "IP Pool",
-    "New_Router": "New Router",
-    "Add_Router": "Add Router",
-    "Edit_Router": "Edit Router",
-    "Router_Name": "Router Name",
-    "IP_Address": "IP Address",
-    "Router_Secret": "Router Secret",
-    "Description": "Description",
-    "IP_Router_Already_Exist": "IP Router Already Exist",
-    "Name_Pool": "Name Pool",
-    "Range_IP": "Range IP",
-    "New_Pool": "New Pool",
-    "Add_Pool": "Add Pool",
-    "Edit_Pool": "Edit Pool",
-    "Pool_Name_Already_Exist": "Pool Name Already Exist",
-    "Refill_Account": "Refill Account",
-    "Recharge_Account": "Recharge Account",
-    "Select_Account": "Select Account",
-    "Service_Plan": "Service Plan",
-    "Recharge": "Recharge",
-    "Method": "Method",
-    "Account_Created_Successfully": "Account Created Successfully",
-    "Database_Status": "Database Status",
-    "Total_Database_Size": "Total Database Size",
-    "Download_Database_Backup": "Download Database Backup",
-    "Table_Name": "Table Name",
-    "Rows": "Rows",
-    "Size": "Size",
-    "Customer": "Customer",
-    "Add_New_Contact": "Add New Contact",
-    "Edit_Contact": "Edit Contact",
-    "List_Contact": "List Contact",
-    "Manage_Contact": "Manage Contact",
-    "Reports": "Reports",
-    "Daily_Reports": "Daily Reports",
-    "Period_Reports": "Period Reports",
-    "All_Transactions": "All Transactions",
-    "Total_Income": "Total Income",
-    "All_Transactions_at_Date": "All Transactions at Date",
-    "Export_for_Print": "Export for Print",
-    "Print": "Print",
-    "Export_to_PDF": "Export to PDF",
-    "Click_Here_to_Print": "Click Here to Print",
-    "You_can_use_html_tag": "You can use html tag",
-    "Date_Format": "Date Format",
-    "Income_Today": "Income Today",
-    "Income_This_Month": "Income This Month",
-    "Users_Active": "Users Active",
-    "Total_Users": "Total Users",
-    "Users": "Users",
-    "Edit_User": "Edit User",
-    "Last_Login": "Last Login",
-    "Administrator_Users": "Administrator Users",
-    "Manage_Administrator": "Manage Administrator",
-    "Add_New_Administrator": "Add New Administrator",
-    "Localisation": "Localisation",
-    "Backup_Restore": "Backup\/Restore",
-    "General_Settings": "General Settings",
-    "Date": "Date",
-    "Login_Successful": "Login Successful",
-    "Failed_Login": "Failed Login",
     "Settings_Saved_Successfully": "Settings Saved Successfully",
-    "User_Updated_Successfully": "User Updated Successfully",
-    "User_Expired__Today": "User Expired, Today",
-    "Activity_Log": "Activity Log",
-    "View_Reports": "View Reports",
-    "View_All": "View All",
-    "Number_of_Vouchers": "Number of Vouchers",
-    "Length_Code": "Length Code",
-    "Code_Voucher": "Code Voucher",
-    "Voucher": "Voucher",
-    "Hotspot_Voucher": "Hotspot Voucher",
-    "Status_Voucher": "Status Voucher",
-    "Add_Vouchers": "Add Vouchers",
-    "Create_Vouchers_Successfully": "Create Vouchers Successfully",
-    "Generate": "Generate",
-    "Print_side_by_side__it_will_easy_to_cut": "Print side by side, it will easy to cut",
-    "From_Date": "From Date",
-    "To_Date": "To Date",
-    "New_Service": "New Service",
-    "Type": "Type",
-    "Finish": "Finish",
-    "Application_Name__Company_Name": "Application Name\/ Company Name",
-    "This_Name_will_be_shown_on_the_Title": "This Name will be shown on the Title",
-    "Next": "Next",
-    "Last": "Last",
-    "Timezone": "Timezone",
-    "Decimal_Point": "Decimal Point",
-    "Thousands_Separator": "Thousands Separator",
-    "Currency_Code": "Currency Code",
-    "Order_Voucher": "Order Voucher",
-    "Voucher_Activation": "Voucher Activation",
-    "List_Activated_Voucher": "List Activated Voucher",
-    "Enter_voucher_code_here": "Enter voucher code here",
-    "Private_Message": "Private Message",
-    "Inbox": "Inbox",
-    "Outbox": "Outbox",
-    "Compose": "Compose",
-    "Send_to": "Send to",
-    "Title": "Title",
-    "Message": "Message",
-    "Your_Account_Information": "Your Account Information",
-    "Welcome_to_the_Panel_Members_page__on_this_page_you_can_": "Welcome to the Panel Members page, on this page you can:",
-    "Invalid_Username_or_Password": "Invalid Username or Password",
-    "You_do_not_have_permission_to_access_this_page": "You do not have permission to access this page",
-    "Incorrect_Current_Password": "Incorrect Current Password",
-    "Password_changed_successfully__Please_login_again": "Password changed successfully, Please login again",
-    "All_field_is_required": "All field is required",
-    "Voucher_Not_Valid": "Voucher Not Valid",
-    "Activation_Vouchers_Successfully": "Activation Vouchers Successfully",
-    "Data_Not_Found": "Data Not Found",
-    "Search_by_Username": "Search by Username",
-    "Search_by_Name": "Search by Name",
-    "Search_by_Code_Voucher": "Search by Code Voucher",
-    "Search": "Search",
-    "Select_a_customer": "Select a customer",
-    "Select_Routers": "Select Routers",
-    "Select_Plans": "Select Plans",
-    "Select_Pool": "Select Pool",
-    "Hrs": "Hrs",
-    "Mins": "Mins",
-    "Days": "Days",
-    "Months": "Months",
-    "Add_Language": "Add Language",
-    "Language_Name": "Language Name",
-    "Folder_Name": "Folder Name",
-    "Translator": "Translator",
-    "Language_Name_Already_Exist": "Language Name Already Exist",
-    "Payment_Gateway": "Payment Gateway",
-    "Community": "Community",
-    "1_user_can_be_used_for_many_devices_": "1 user can be used for many devices?",
-    "Cannot_be_change_after_saved": "Cannot be change after saved",
-    "Explain_Coverage_of_router": "Explain Coverage of router",
-    "Name_of_Area_that_router_operated": "Name of Area that router operated",
-    "Payment_Notification_URL__Recurring_Notification_URL__Pay_Account_Notification_URL": "Payment Notification URL, Recurring Notification URL, Pay Account Notification URL",
-    "Finish_Redirect_URL__Unfinish_Redirect_URL__Error_Redirect_URL": "Finish Redirect URL, Unfinish Redirect URL, Error Redirect URL",
-    "Status": "Status",
-    "Plan_Not_found": "Plan Not found",
-    "Failed_to_create_transaction_": "Failed to create transaction.",
-    "Seller_has_not_yet_setup_Xendit_payment_gateway": "Seller has not yet setup Xendit payment gateway",
-    "Admin_has_not_yet_setup_Xendit_payment_gateway__please_tell_admin": "Admin has not yet setup Xendit payment gateway, please tell admin",
-    "You_already_have_unpaid_transaction__cancel_it_or_pay_it_": "You already have unpaid transaction, cancel it or pay it.",
-    "Transaction_Not_found": "Transaction Not found",
-    "Cancel_it_": "Cancel it?",
-    "expired": "expired",
-    "Check_for_Payment": "Check for Payment",
-    "Transaction_still_unpaid_": "Transaction still unpaid.",
-    "Paid_Date": "Paid Date",
-    "Transaction_has_been_paid_": "Transaction has been paid.",
-    "PAID": "PAID",
-    "CANCELED": "CANCELED",
-    "UNPAID": "UNPAID",
-    "PAY_NOW": "PAY NOW",
-    "Buy_Hotspot_Plan": "Buy Hotspot Plan",
-    "Buy_PPOE_Plan": "Buy PPOE Plan",
-    "Package": "Package",
-    "Order_Internet_Package": "Order Internet Package",
-    "Unknown_Command_": "Unknown Command.",
-    "Checking_payment": "Checking payment",
-    "Create_Transaction_Success": "Create Transaction Success",
-    "You_have_unpaid_transaction": "You have unpaid transaction",
-    "TripayPayment_Channel": "TripayPayment Channel",
-    "Payment_Channel": "Payment Channel",
-    "Payment_check_failed_": "Payment check failed.",
-    "Order_Package": "Order Package",
-    "Transactions": "Transactions",
-    "Payments": "Payments",
-    "History": "History",
-    "Order_History": "Order History",
-    "Gateway": "Gateway",
-    "Date_Done": "Date Done",
-    "Unpaid_Order": "Unpaid Order",
-    "Payment_Gateway_Not_Found": "Payment Gateway Not Found",
-    "Payment_Gateway_saved_successfully": "Payment Gateway saved successfully",
-    "ORDER": "ORDER",
-    "Package_History": "Package History",
-    "Buy_History": "Buy History",
-    "Activation_History": "Activation History",
-    "Buy_Package": "Buy Package",
-    "Email": "Email",
-    "Company_Footer": "Company Footer",
-    "Will_show_below_user_pages": "Will show below user pages",
-    "Request_OTP": "Request OTP",
-    "Verification_Code": "Verification Code",
-    "SMS_Verification_Code": "SMS Verification Code",
-    "Please_enter_your_email_address": "Please enter your email address",
-    "Failed_to_create_Paypal_transaction_": "Failed to create Paypal transaction.",
-    "Plugin": "Plugin",
-    "Plugin_Manager": "Plugin Manager",
-    "User_Notification": "User Notification",
-    "Expired_Notification": "Expired Notification",
-    "User_will_get_notification_when_package_expired": "User will get notification when package expired",
-    "Expired_Notification_Message": "Expired Notification Message",
-    "Payment_Notification": "Payment Notification",
-    "User_will_get_invoice_notification_when_buy_package_or_package_refilled": "User will get invoice notification when buy package or package refilled",
-    "Current_IP": "Current IP",
-    "Current_MAC": "Current MAC",
-    "Login_Status": "Login Status",
-    "Login_Request_successfully": "Login Request successfully",
-    "Logout_Request_successfully": "Logout Request successfully",
-    "Disconnect_Internet_": "Disconnect Internet?",
-    "Not_Online__Login_now_": "Not Online, Login now?",
-    "You_are_Online__Logout_": "You are Online, Logout?",
-    "Connect_to_Internet_": "Connect to Internet?",
-    "Your_account_not_connected_to_internet": "Your account not connected to internet",
-    "Failed_to_create_transaction__": "Failed to create transaction. ",
-    "Failed_to_check_status_transaction__": "Failed to check status transaction. ",
-    "Disable_Voucher": "Disable Voucher",
-    "Balance": "Balance",
-    "Balance_System": "Balance System",
-    "Enable_System": "Enable System",
-    "Allow_Transfer": "Allow Transfer",
-    "Telegram_Notification": "Telegram Notification",
-    "SMS_OTP_Registration": "SMS OTP Registration",
-    "Whatsapp_Notification": "Whatsapp Notification",
-    "Tawk_to_Chat_Widget": "Tawk.to Chat Widget",
-    "Invoice": "Invoice",
-    "Country_Code_Phone": "Country Code Phone",
-    "Voucher_activation_menu_will_be_hidden": "Voucher activation menu will be hidden",
-    "Customer_can_deposit_money_to_buy_voucher": "Customer can deposit money to buy voucher",
-    "Allow_balance_transfer_between_customers": "Allow balance transfer between customers",
-    "Reminder_Notification": "Reminder Notification",
-    "Reminder_Notification_Message": "Reminder Notification Message",
-    "Reminder_7_days": "Reminder 7 days",
-    "Reminder_3_days": "Reminder 3 days",
-    "Reminder_1_day": "Reminder 1 day",
-    "PPPOE_Password": "PPPOE Password",
-    "User_Cannot_change_this__only_admin__if_it_Empty_it_will_use_user_password": "User Cannot change this, only admin. if it Empty it will use user password",
-    "Invoice_Balance_Message": "Invoice Balance Message",
-    "Invoice_Notification_Payment": "Invoice Notification Payment",
-    "Balance_Notification_Payment": "Balance Notification Payment",
-    "Balance_Plans": "Balance Plans",
-    "Buy_Balance": "Buy Balance",
-    "Price": "Price",
-    "Validity": "Validity",
-    "Disable_auto_renewal_": "Disable auto renewal?",
-    "Auto_Renewal_On": "Auto Renewal On",
-    "Enable_auto_renewal_": "Enable auto renewal?",
-    "Auto_Renewal_Off": "Auto Renewal Off",
-    "Refill_Balance": "Refill Balance",
-    "Invoice_Footer": "Invoice Footer",
-    "Pay_With_Balance": "Pay With Balance",
-    "Pay_this_with_Balance__your_active_package_will_be_overwrite": "Pay this with Balance? your active package will be overwrite",
-    "Success_to_buy_package": "Success to buy package",
-    "Auto_Renewal": "Auto Renewal",
-    "View": "View",
-    "Back": "Back",
-    "Active": "Active",
-    "Transfer_Balance": "Transfer Balance",
-    "Send_your_balance_": "Send your balance?",
-    "Send": "Send",
-    "Cannot_send_to_yourself": "Cannot send to yourself",
-    "Sending_balance_success": "Sending balance success",
-    "From": "From",
-    "To": "To",
-    "insufficient_balance": "insufficient balance",
-    "Send_Balance": "Send Balance",
-    "Received_Balance": "Received Balance",
-    "Minimum_Balance_Transfer": "Minimum Balance Transfer",
-    "Minimum_Transfer": "Minimum Transfer",
-    "Company_Logo": "Company Logo",
-    "Expired_IP_Pool": "Expired IP Pool",
-    "Proxy": "Proxy",
-    "Proxy_Server": "Proxy Server",
-    "Proxy_Server_Login": "Proxy Server Login",
-    "Hotspot_Plan": "Hotspot Plan",
-    "PPPOE_Plan": "PPPOE Plan",
-    "UNKNOWN": "UNKNOWN",
-    "Are_You_Sure_": "Are You Sure?",
-    "Success_to_send_package": "Success to send package",
-    "Target_has_active_plan__different_with_current_plant_": "Target has active plan, different with current plant.",
-    "Recharge_a_friend": "Recharge a friend",
-    "Buy_for_friend": "Buy for friend",
-    "Buy_this_for_friend_account_": "Buy this for friend account?",
-    "Review_package_before_recharge": "Review package before recharge",
-    "Activate": "Activate",
-    "Deactivate": "Deactivate",
-    "Sync": "Sync",
-    "Failed_to_create_PaymeTrust_transaction_": "Failed to create PaymeTrust transaction.",
-    "Location": "Location",
-    "Radius_Plans": "Radius Plans",
-    "Change_title_in_user_Plan_order": "Change title in user Plan order",
-    "Logs": "Logs",
-    "Voucher_Format": "Voucher Format",
-    "Resend_To_Customer": "Resend To Customer",
-    "Your_friend_do_not_have_active_package": "Your friend do not have active package",
-    "Service_Type": "Service Type",
-    "Others": "Others",
-    "PPPoE": "PPPoE",
-    "Hotspot": "Hotspot",
-    "Disable_Registration": "Disable Registration",
-    "Customer_just_Login_with_Phone_number_and_Voucher_Code__Voucher_will_be_password": "Customer just Login with Phone number and Voucher Code, Voucher will be password",
-    "Login___Activate_Voucher": "Login \/ Activate Voucher",
-    "After_Customer_activate_voucher_or_login__customer_will_be_redirected_to_this_url": "After Customer activate voucher or login, customer will be redirected to this url",
-    "Voucher_Prefix": "Voucher Prefix",
-    "Voucher_activation_success__now_you_can_login": "Voucher activation success, now you can login",
-    "Buy_this__your_active_package_will_be_overwritten": "Buy this? your active package will be overwritten",
-    "Pay_this_with_Balance__your_active_package_will_be_overwritten": "Pay this with Balance? your active package will be overwritten",
-    "Buy_this__your_active_package_will_be_overwrite": "Buy this? your active package will be overwrite",
-    "Monthly_Registered_Customers": "Monthly Registered Customers",
-    "Total_Monthly_Sales": "Total Monthly Sales",
-    "Active_Users": "Active Users",
-    "All_Users_Insights": "All Users Insights",
+    "Settings": "Settings",
     "SuperAdmin": "Super Admin",
-    "Radius": "Radius",
-    "Radius_NAS": "Radius NAS",
-    "Translation": "Translation",
-    "Translation_saved_Successfully": "Translation saved Successfully",
-    "Language_Editor": "Language Editor",
-    "year": "year",
-    "month": "month",
-    "week": "week",
-    "day": "day",
-    "hour": "hour",
-    "minute": "minute",
-    "second": "second",
-    "Attributes": "Attributes",
-    "Profile": "Profile",
-    "Phone": "Phone",
-    "City": "City",
-    "Sub_District": "Sub District",
-    "Ward": "Ward",
-    "Credentials": "Credentials",
-    "Agent": "Agent",
-    "This_Token_will_act_as_SuperAdmin_Admin": "This Token will act as SuperAdmin\/Admin",
-    "Login": "Login",
-    "Expired_Action": "Expired Action",
-    "Expired_Address_List_Name": "Expired Address List Name",
-    "Address_List": "Address List",
-    "Optional": "Optional",
-    "Generated_By": "Generated By",
-    "Admin": "Admin",
-    "Password_should_be_minimum_6_characters": "Password should be minimum 6 characters",
-    "Add_User": "Add User",
-    "Send_Notification": "Send Notification",
-    "Code": "Code",
-    "Send_To_Customer": "Send To Customer",
-    "Prev": "Prev",
-    "Voucher_Not_Found": "Voucher Not Found",
-    "Miscellaneous": "Miscellaneous",
-    "OTP_Required": "OTP Required",
-    "Change": "Change",
-    "Change_Phone_Number": "Change Phone Number",
-    "Current_Number": "Current Number",
-    "New_Number": "New Number",
-    "Input_your_phone_number": "Input your phone number",
-    "OTP": "OTP",
-    "Enter_OTP_that_was_sent_to_your_phone": "Enter OTP that was sent to your phone",
-    "Update": "Update",
-    "OTP_is_required_when_user_want_to_change_phone_number": "OTP is required when user want to change phone number",
-    "Rate": "Rate",
-    "Burst": "Burst",
-    "Editing_Bandwidth_will_not_automatically_update_the_plan__you_need_to_edit_the_plan_then_save_again": "Editing Bandwidth will not automatically update the plan, you need to edit the plan then save again",
-    "OTP_Method": "OTP Method",
-    "SMS": "SMS",
-    "WhatsApp": "WhatsApp",
-    "SMS_and_WhatsApp": "SMS and WhatsApp",
-    "The_method_which_OTP_will_be_sent_to_user": "The method which OTP will be sent to user",
-    "Report_Viewer": "Report Viewer",
-    "Super_Administrator": "Super Administrator",
-    "Send_To": "Send To",
-    "Resend": "Resend",
-    "Alert": "Alert",
-    "success": "success",
-    "Click_Here": "Click Here",
-    "danger": "danger",
-    "Logout_Successful": "Logout Successful",
-    "warning": "warning",
-    "Users_Announcement": "Users Announcement",
-    "Customer_Announcement": "Customer Announcement",
-    "1_Period___1_Month__Expires_the_20th_of_each_month": "1 Period = 1 Month, Expires the 20th of each month",
-    "Period": "Period",
-    "Add": "Add",
-    "Select_Payment_Gateway": "Select Payment Gateway",
-    "Available_Payment_Gateway": "Available Payment Gateway",
-    "Pay_Now": "Pay Now",
-    "Please_select_Payment_Gateway": "Please select Payment Gateway",
-    "Payment_Gateway_Deleted": "Payment Gateway Deleted",
-    "Payment_Gateway_not_set__please_set_it_in_Settings": "Payment Gateway not set, please set it in Settings",
-    "Failed_to_create_Transaction__": "Failed to create Transaction..",
-    "Show_To_Customer": "Type",
-    "Using": "Using",
-    "Default": "Default",
-    "Customer_Balance": "Customer Balance",
+    "Change_Password": "Change Password",
+    "My_Account": "My Account",
+    "Logout": "Logout",
+    "Dashboard": "Dashboard",
+    "Customer": "Customer",
+    "Lists": "Lists",
+    "Location": "Location",
+    "Services": "Services",
+    "Active_Users": "Active Users",
     "Vouchers": "Vouchers",
     "Refill_Customer": "Refill Customer",
     "Recharge_Customer": "Recharge Customer",
+    "Refill_Balance": "Refill Balance",
     "Plans": "Plans",
+    "Hotspot": "Hotspot",
     "PPPOE": "PPPOE",
     "Bandwidth": "Bandwidth",
-    "Customers": "Customers",
-    "Actives": "Actives",
-    "Name": "Name",
-    "Confirm": "Confirm",
-    "Plan": "Plan",
-    "Total": "Total",
-    "Current_Cycle": "Current Cycle",
-    "Additional_Cost": "Additional Cost",
-    "Remaining": "Remaining",
-    "Not_Found": "Not Found",
-    "Cash": "Cash",
-    "Payment_not_found": "Payment not found",
-    "If_your_friend_have_Additional_Cost__you_will_pay_for_that_too": "If your friend have Additional Cost, you will pay for that too",
-    "Cache_cleared_successfully_": "Cache cleared successfully!",
-    "Paid": "Paid",
+    "Balance": "Balance",
+    "Reports": "Reports",
+    "Daily_Reports": "Daily Reports",
+    "Period_Reports": "Period Reports",
+    "Activation_History": "Activation History",
     "Send_Message": "Send Message",
-    "Send_Personal_Message": "Send Personal Message",
-    "Send_Via": "Send Via",
-    "Compose_your_message___": "Compose your message...",
-    "Use_placeholders_": "Use placeholders:",
-    "Customer_Name": "Customer Name",
-    "Customer_Username": "Customer Username",
-    "Customer_Phone": "Customer Phone",
-    "Your_Company_Name": "Your Company Name",
-    "Message_Sent_Successfully": "Message Sent Successfully",
-    "Send_Bulk_Message": "Send Bulk Message",
-    "Group": "Group",
-    "All_Customers": "All Customers",
-    "New_Customers": "New Customers",
-    "Expired_Customers": "Expired Customers",
-    "Active_Customers": "Active Customers",
-    "Map": "Map",
-    "Customer_Location": "Customer Location",
-    "Account_Type": "Account Type",
-    "Coordinates": "Coordinates",
-    "Latitude_and_Longitude_coordinates_for_map_must_be_separate_with_comma____": "Latitude and Longitude coordinates for map must be separate with comma &quot;,&quot;",
-    "Customer_Geo_Location_Information": "Customer Geo Location Information",
-    "List": "List",
-    "Lists": "Lists",
     "Single_Customer": "Single Customer",
     "Bulk_Customers": "Bulk Customers",
-    "Message_per_time": "Message per time",
-    "5_Messages": "5 Messages",
-    "10_Messages": "10 Messages",
-    "15_Messages": "15 Messages",
-    "20_Messages": "20 Messages",
-    "30_Messages": "30 Messages",
-    "40_Messages": "40 Messages",
-    "50_Messages": "50 Messages",
-    "60_Messages": "60 Messages",
-    "Use_20_and_above_if_you_are_sending_to_all_customers_to_avoid_server_time_out": "Use 20 and above if you are sending to all customers to avoid server time out",
-    "Delay": "Delay",
-    "No_Delay": "No Delay",
-    "5_Seconds": "5 Seconds",
-    "10_Seconds": "10 Seconds",
-    "15_Seconds": "15 Seconds",
-    "20_Seconds": "20 Seconds",
-    "Use_at_least_5_secs_if_you_are_sending_to_all_customers_to_avoid_being_banned_by_your_message_provider": "Use at least 5 secs if you are sending to all customers to avoid being banned by your message provider",
-    "Testing__if_checked_no_real_message_is_sent_": "Testing [if checked no real message is sent]",
-    "All_fields_are_required": "All fields are required",
+    "Network": "Network",
+    "Routers": "Routers",
+    "IP_Pool": "IP Pool",
+    "Radius": "Radius",
+    "Radius_NAS": "Radius NAS",
+    "Static_Pages": "Static Pages",
+    "Order_Voucher": "Order Voucher",
+    "Voucher": "Voucher",
+    "Announcement": "Announcement",
+    "Customer_Announcement": "Customer Announcement",
+    "Registration_Info": "Registration Info",
+    "General_Settings": "General Settings",
+    "Localisation": "Localisation",
+    "User_Notification": "User Notification",
+    "Administrator_Users": "Administrator Users",
+    "Backup_Restore": "Backup\/Restore",
+    "Payment_Gateway": "Payment Gateway",
+    "Plugin_Manager": "Plugin Manager",
+    "Logs": "Logs",
+    "Community": "Community",
+    "Timezone": "Timezone",
+    "Date_Format": "Date Format",
+    "Default_Language": "Default Language",
+    "Language_Editor": "Language Editor",
+    "Decimal_Point": "Decimal Point",
+    "Thousands_Separator": "Thousands Separator",
+    "Currency_Code": "Currency Code",
+    "Keep_it_blank_if_you_do_not_want_to_show_currency_code": "Keep it blank if you do not want to show currency code",
+    "Country_Code_Phone": "Country Code Phone",
+    "Change_title_in_user_Plan_order": "Change title in user Plan order",
+    "Save_Changes": "Save Changes",
+    "Recharge_Account": "Recharge Account",
+    "Search_by_Username": "Search by Username",
+    "Search": "Search",
+    "Username": "Username",
+    "Plan_Name": "Plan Name",
+    "Plan_Type": "Plan Type",
+    "Type": "Type",
+    "Created_On": "Created On",
+    "Expires_On": "Expires On",
+    "Method": "Method",
+    "Manage": "Manage",
+    "Edit": "Edit",
+    "Delete": "Delete",
+    "Prev": "Prev",
+    "Next": "Next",
+    "Phone_Number": "Phone Number",
+    "Email": "Email",
+    "Password": "Password",
+    "Paid": "Paid",
+    "Service_Type": "Service Type",
+    "Account_Type": "Account Type",
     "Personal": "Personal",
-    "Email_Notification": "Email Notification",
-    "Router_Name___Location": "Router Name \/ Location",
-    "Plan_Category": "Plan Category",
-    "ID": "ID"
+    "Auto_Renewal": "Auto Renewal",
+    "Last_Login": "Last Login",
+    "Coordinates": "Coordinates",
+    "Active": "Active",
+    "Deactivate": "Deactivate",
+    "Recharge": "Recharge",
+    "Back": "Back",
+    "Sync": "Sync",
+    "Order_History": "Order History",
+    "Invoice": "Invoice",
+    "Plan_Price": "Plan Price",
+    "Edit_Contact": "Edit Contact",
+    "Full_Name": "Full Name",
+    "Keep_Blank_to_do_not_change_Password": "Keep Blank to do not change Password",
+    "PPPOE_Password": "PPPOE Password",
+    "User_Cannot_change_this__only_admin__if_it_Empty_it_will_use_user_password": "User Cannot change this, only admin. if it Empty it will use user password",
+    "Address": "Address",
+    "Attributes": "Attributes",
+    "Add": "Add",
+    "Cancel": "Cancel",
+    "Manage_Contact": "Manage Contact",
+    "Add_New_Contact": "Add New Contact",
+    "Package": "Package",
+    "View": "View"
 }
\ No newline at end of file
diff --git a/ui/ui/customers-add.tpl b/ui/ui/customers-add.tpl
index 58c777cb..db70e9cd 100644
--- a/ui/ui/customers-add.tpl
+++ b/ui/ui/customers-add.tpl
@@ -10,14 +10,15 @@
                         <label class="col-md-3 control-label">{Lang::T('Username')}</label>
                         <div class="col-md-9">
                             <div class="input-group">
-                                {if $_c['country_code_phone']!= ''}
-                                    <span class="input-group-addon" id="basic-addon1">+</span>
+                                {if $_c['country_code_phone'] != ''}
+                                    <span class="input-group-addon" id="basic-addon1"><i
+                                    class="glyphicon glyphicon-phone-alt"></i></span>
                                 {else}
                                     <span class="input-group-addon" id="basic-addon1"><i
-                                            class="glyphicon glyphicon-phone-alt"></i></span>
+                                            class="glyphicon glyphicon-user"></i></span>
                                 {/if}
                                 <input type="text" class="form-control" name="username" required
-                                    placeholder="{if $_c['country_code_phone']!= ''}{$_c['country_code_phone']}{/if} {Lang::T('Phone Number')}">
+                                    placeholder="{if $_c['country_code_phone']!= ''}{$_c['country_code_phone']} {Lang::T('Phone Number')}{else}{Lang::T('Username')}{/if}">
                             </div>
                         </div>
                     </div>
diff --git a/ui/ui/customers-edit.tpl b/ui/ui/customers-edit.tpl
index c7a0d47b..863f97b8 100644
--- a/ui/ui/customers-edit.tpl
+++ b/ui/ui/customers-edit.tpl
@@ -12,14 +12,15 @@
                         <div class="col-md-9">
                             <div class="input-group">
                                 {if $_c['country_code_phone']!= ''}
-                                    <span class="input-group-addon" id="basic-addon1">+</span>
-                                {else}
                                     <span class="input-group-addon" id="basic-addon1"><i
                                             class="glyphicon glyphicon-phone-alt"></i></span>
+                                {else}
+                                    <span class="input-group-addon" id="basic-addon1"><i
+                                            class="glyphicon glyphicon-user"></i></span>
                                 {/if}
                                 <input type="text" class="form-control" name="username" value="{$d['username']}"
                                     required
-                                    placeholder="{if $_c['country_code_phone']!= ''}{$_c['country_code_phone']}{/if} {Lang::T('Phone Number')}">
+                                placeholder="{if $_c['country_code_phone']!= ''}{$_c['country_code_phone']} {Lang::T('Phone Number')}{else}{Lang::T('Username')}{/if}">
                             </div>
                         </div>
                     </div>
diff --git a/ui/ui/logs-radius.tpl b/ui/ui/logs-radius.tpl
index 9fb922f9..22e6ef88 100644
--- a/ui/ui/logs-radius.tpl
+++ b/ui/ui/logs-radius.tpl
@@ -4,7 +4,7 @@
     <div class="col-sm-12">
         <div class="panel panel-hovered mb20 panel-primary">
             <div class="panel-heading">
-				{if in_array($_admin['user_type'],['SuperAdmin','Admin'])}
+                {if in_array($_admin['user_type'],['SuperAdmin','Admin'])}
                     <div class="btn-group pull-right">
                         <a class="btn btn-primary btn-xs" title="save" href="{$_url}logs/radius-csv"
                             onclick="return confirm('This will export to CSV?')"><span class="glyphicon glyphicon-download"
@@ -66,4 +66,4 @@
     </div>
 </div>
 
-{include file="sections/footer.tpl"}
+{include file="sections/footer.tpl"}
\ No newline at end of file
diff --git a/ui/ui/logs.tpl b/ui/ui/logs.tpl
index 68f6412a..c43864db 100644
--- a/ui/ui/logs.tpl
+++ b/ui/ui/logs.tpl
@@ -4,7 +4,7 @@
     <div class="col-sm-12">
         <div class="panel panel-hovered mb20 panel-primary">
             <div class="panel-heading">
-				{if in_array($_admin['user_type'],['SuperAdmin','Admin'])}
+                {if in_array($_admin['user_type'],['SuperAdmin','Admin'])}
                     <div class="btn-group pull-right">
                         <a class="btn btn-primary btn-xs" title="save" href="{$_url}logs/list-csv"
                             onclick="return confirm('This will export to CSV?')"><span class="glyphicon glyphicon-download"
@@ -63,4 +63,4 @@
     </div>
 </div>
 
-{include file="sections/footer.tpl"}
+{include file="sections/footer.tpl"}
\ No newline at end of file
diff --git a/ui/ui/register-otp.tpl b/ui/ui/register-otp.tpl
index 4961122e..1d3ed8f0 100644
--- a/ui/ui/register-otp.tpl
+++ b/ui/ui/register-otp.tpl
@@ -26,22 +26,22 @@
             <hr>
         </div>
         {if isset($notify)}
-        <script>
-            // Display SweetAlert toast notification
-            Swal.fire({
-                icon: '{if $notify_t == "s"}success{else}warning{/if}',
-                title: '{$notify}',
-                toast: true,
-                position: 'top-end',
-                showConfirmButton: false,
-                timer: 5000,
-                timerProgressBar: true,
-                didOpen: (toast) => {
-                    toast.addEventListener('mouseenter', Swal.stopTimer)
-                    toast.addEventListener('mouseleave', Swal.resumeTimer)
-                }
-            });
-        </script>
+            <script>
+                // Display SweetAlert toast notification
+                Swal.fire({
+                    icon: '{if $notify_t == "s"}success{else}warning{/if}',
+                    title: '{$notify}',
+                    toast: true,
+                    position: 'top-end',
+                    showConfirmButton: false,
+                    timer: 5000,
+                    timerProgressBar: true,
+                    didOpen: (toast) => {
+                        toast.addEventListener('mouseenter', Swal.stopTimer)
+                        toast.addEventListener('mouseleave', Swal.resumeTimer)
+                    }
+                });
+            </script>
         {/if}
         <div class="row">
             <div class="col-md-4">
@@ -62,13 +62,14 @@
                                     <label>{Lang::T('Phone Number')}</label>
                                     <div class="input-group">
                                         {if $_c['country_code_phone']!= ''}
-                                            <span class="input-group-addon" id="basic-addon1">+</span>
-                                        {else}
                                             <span class="input-group-addon" id="basic-addon1"><i
                                                     class="glyphicon glyphicon-phone-alt"></i></span>
+                                        {else}
+                                            <span class="input-group-addon" id="basic-addon1"><i
+                                                    class="glyphicon glyphicon-user"></i></span>
                                         {/if}
                                         <input type="text" class="form-control" name="username" value="{$username}"
-                                            placeholder="{if $_c['country_code_phone']!= ''}{$_c['country_code_phone']}{/if} {Lang::T('Phone Number')}">
+                                            placeholder="{if $_c['country_code_phone']!= ''}{$_c['country_code_phone']} {Lang::T('Phone Number')}{else}{Lang::T('Username')}{/if}">
                                     </div>
                                 </div>
                                 <div class="form-group">
@@ -83,7 +84,7 @@
                                 </div>
                                 <div class="form-group">
                                     <label>{Lang::T('Email')}</label>
-                                    <input type="text" required class="form-control" placeholder="xxxxxx@xxx.xx"
+                                    <input type="text" class="form-control" placeholder="xxxxxx@xxx.xx"
                                         id="email" value="{$email}" name="email">
                                 </div>
                                 <div class="form-group">
@@ -111,8 +112,7 @@
                                 </div>
                                 <div class="btn-group btn-group-justified mb15">
                                     <div class="btn-group">
-                                        <button class="btn btn-primary"
-                                            type="submit">{Lang::T('Register')}</button>
+                                        <button class="btn btn-primary" type="submit">{Lang::T('Register')}</button>
                                     </div>
                                     <div class="btn-group">
                                         <a href="{$_url}register" class="btn btn-success">{Lang::T('Cancel')}</a>
diff --git a/ui/ui/register-rotp.tpl b/ui/ui/register-rotp.tpl
index 9a251acc..37efabbb 100644
--- a/ui/ui/register-rotp.tpl
+++ b/ui/ui/register-rotp.tpl
@@ -25,22 +25,22 @@
             <hr>
         </div>
         {if isset($notify)}
-        <script>
-            // Display SweetAlert toast notification
-            Swal.fire({
-                icon: '{if $notify_t == "s"}success{else}warning{/if}',
-                title: '{$notify}',
-                toast: true,
-                position: 'top-end',
-                showConfirmButton: false,
-                timer: 5000,
-                timerProgressBar: true,
-                didOpen: (toast) => {
-                    toast.addEventListener('mouseenter', Swal.stopTimer)
-                    toast.addEventListener('mouseleave', Swal.resumeTimer)
-                }
-            });
-        </script>
+            <script>
+                // Display SweetAlert toast notification
+                Swal.fire({
+                    icon: '{if $notify_t == "s"}success{else}warning{/if}',
+                    title: '{$notify}',
+                    toast: true,
+                    position: 'top-end',
+                    showConfirmButton: false,
+                    timer: 5000,
+                    timerProgressBar: true,
+                    didOpen: (toast) => {
+                        toast.addEventListener('mouseenter', Swal.stopTimer)
+                        toast.addEventListener('mouseleave', Swal.resumeTimer)
+                    }
+                });
+            </script>
         {/if}
         <div class="row">
             <div class="col-md-2">
@@ -62,13 +62,14 @@
                                 <label>{Lang::T('Phone Number')}</label>
                                 <div class="input-group">
                                     {if $_c['country_code_phone']!= ''}
-                                        <span class="input-group-addon" id="basic-addon1">+</span>
-                                    {else}
                                         <span class="input-group-addon" id="basic-addon1"><i
                                                 class="glyphicon glyphicon-phone-alt"></i></span>
+                                    {else}
+                                        <span class="input-group-addon" id="basic-addon1"><i
+                                                class="glyphicon glyphicon-user"></i></span>
                                     {/if}
                                     <input type="text" class="form-control" name="username"
-                                        placeholder="{if $_c['country_code_phone']!= ''}{$_c['country_code_phone']}{/if} {Lang::T('Phone Number')}">
+                                        placeholder="{if $_c['country_code_phone']!= ''}{$_c['country_code_phone']} {Lang::T('Phone Number')}{else}{Lang::T('Username')}{/if}">
                                 </div>
                             </div>
                             <div class="btn-group btn-group-justified mb15">
@@ -76,8 +77,7 @@
                                     <a href="{$_url}login" class="btn btn-warning">{Lang::T('Cancel')}</a>
                                 </div>
                                 <div class="btn-group">
-                                    <button class="btn btn-success"
-                                        type="submit">{Lang::T('Request OTP')}</button>
+                                    <button class="btn btn-success" type="submit">{Lang::T('Request OTP')}</button>
                                 </div>
                             </div>
                             <br>
diff --git a/ui/ui/register.tpl b/ui/ui/register.tpl
index c5e5d377..fb37dd18 100644
--- a/ui/ui/register.tpl
+++ b/ui/ui/register.tpl
@@ -26,22 +26,22 @@
             <hr>
         </div>
         {if isset($notify)}
-        <script>
-            // Display SweetAlert toast notification
-            Swal.fire({
-                icon: '{if $notify_t == "s"}success{else}warning{/if}',
-                title: '{$notify}',
-                toast: true,
-                position: 'top-end',
-                showConfirmButton: false,
-                timer: 5000,
-                timerProgressBar: true,
-                didOpen: (toast) => {
-                    toast.addEventListener('mouseenter', Swal.stopTimer)
-                    toast.addEventListener('mouseleave', Swal.resumeTimer)
-                }
-            });
-        </script>
+            <script>
+                // Display SweetAlert toast notification
+                Swal.fire({
+                    icon: '{if $notify_t == "s"}success{else}warning{/if}',
+                    title: '{$notify}',
+                    toast: true,
+                    position: 'top-end',
+                    showConfirmButton: false,
+                    timer: 5000,
+                    timerProgressBar: true,
+                    didOpen: (toast) => {
+                        toast.addEventListener('mouseenter', Swal.stopTimer)
+                        toast.addEventListener('mouseleave', Swal.resumeTimer)
+                    }
+                });
+            </script>
         {/if}
         <div class="row">
             <div class="col-md-4">
@@ -61,9 +61,15 @@
                                 <div class="md-input-container">
                                     <label>{Lang::T('Phone Number')}</label>
                                     <div class="input-group">
-                                        <span class="input-group-addon" id="basic-addon1">+</span>
+                                        {if $_c['country_code_phone']!= ''}
+                                            <span class="input-group-addon" id="basic-addon1"><i
+                                                    class="glyphicon glyphicon-phone-alt"></i></span>
+                                        {else}
+                                            <span class="input-group-addon" id="basic-addon1"><i
+                                                    class="glyphicon glyphicon-user"></i></span>
+                                        {/if}
                                         <input type="text" class="form-control" name="username"
-                                            placeholder="{if $_c['country_code_phone']!= ''}{$_c['country_code_phone']}{/if} {Lang::T('Phone Number')}">
+                                            placeholder="{if $_c['country_code_phone']!= ''}{$_c['country_code_phone']} {Lang::T('Phone Number')}{else}{Lang::T('Username')}{/if}">
                                     </div>
                                 </div>
                                 <div class="md-input-container md-float-label">
@@ -73,8 +79,8 @@
                                 </div>
                                 <div class="md-input-container md-float-label">
                                     <label>{Lang::T('Email')}</label>
-                                    <input type="text" required class="form-control" id="email"
-                                        placeholder="xxxxxxx@xxxx.xx" value="{$email}" name="email">
+                                    <input type="text" class="form-control" id="email" placeholder="xxxxxxx@xxxx.xx"
+                                        value="{$email}" name="email">
                                 </div>
                                 <div class="md-input-container md-float-label">
                                     <label>{Lang::T('Address')}</label>
@@ -105,8 +111,7 @@
                                         <a href="{$_url}login" class="btn btn-warning">{Lang::T('Cancel')}</a>
                                     </div>
                                     <div class="btn-group">
-                                        <button class="btn btn-success"
-                                            type="submit">{Lang::T('Register')}</button>
+                                        <button class="btn btn-success" type="submit">{Lang::T('Register')}</button>
                                     </div>
                                 </div>
                                 <br>
diff --git a/ui/ui/user-login-noreg.tpl b/ui/ui/user-login-noreg.tpl
index 0a3c7bdd..c9d93711 100644
--- a/ui/ui/user-login-noreg.tpl
+++ b/ui/ui/user-login-noreg.tpl
@@ -47,13 +47,14 @@
                                 <label>{Lang::T('Phone Number')}</label>
                                 <div class="input-group">
                                     {if $_c['country_code_phone']!= ''}
-                                        <span class="input-group-addon" id="basic-addon1">+</span>
-                                    {else}
                                         <span class="input-group-addon" id="basic-addon1"><i
                                                 class="glyphicon glyphicon-phone-alt"></i></span>
+                                    {else}
+                                        <span class="input-group-addon" id="basic-addon1"><i
+                                                class="glyphicon glyphicon-user"></i></span>
                                     {/if}
                                     <input type="text" class="form-control" name="username" required
-                                        placeholder="08xxxxxxx">
+                                        placeholder="{if $_c['country_code_phone']!= ''}{$_c['country_code_phone']} {Lang::T('Phone Number')}{else}{Lang::T('Username')}{/if}">
                                 </div>
                             </div>
                             <div class="form-group">
diff --git a/ui/ui/user-login.tpl b/ui/ui/user-login.tpl
index 69e7a1f0..41ab24c8 100644
--- a/ui/ui/user-login.tpl
+++ b/ui/ui/user-login.tpl
@@ -48,13 +48,14 @@
                                 <label>{Lang::T('Phone Number')}</label>
                                 <div class="input-group">
                                     {if $_c['country_code_phone']!= ''}
-                                        <span class="input-group-addon" id="basic-addon1">+</span>
+                                        <span class="input-group-addon" id="basic-addon1"><i
+                                        class="glyphicon glyphicon-phone-alt"></i></span>
                                     {else}
                                         <span class="input-group-addon" id="basic-addon1"><i
-                                                class="glyphicon glyphicon-phone-alt"></i></span>
+                                                class="glyphicon glyphicon-user"></i></span>
                                     {/if}
                                     <input type="text" class="form-control" name="username"
-                                        placeholder="{if $_c['country_code_phone']!= ''}{$_c['country_code_phone']}{/if} {Lang::T('Phone Number')}">
+                                placeholder="{if $_c['country_code_phone']!= ''}{$_c['country_code_phone']} {Lang::T('Phone Number')}{else}{Lang::T('Username')}{/if}">
                                 </div>
 
                             </div>
diff --git a/version.json b/version.json
index cd7109fd..fca95a41 100644
--- a/version.json
+++ b/version.json
@@ -1,3 +1,3 @@
 {
-    "version": "2024.4.2"
+    "version": "2024.4.3"
 }
\ No newline at end of file