diff --git a/login/signup_form.php b/login/signup_form.php
index 6bb97ceedac..047efd7e0e7 100644
--- a/login/signup_form.php
+++ b/login/signup_form.php
@@ -40,7 +40,7 @@ class login_signup_form extends moodleform {
 
 
         $mform->addElement('text', 'username', get_string('username'), 'maxlength="100" size="12"');
-        $mform->setType('username', core_user::get_property_type('username'));
+        $mform->setType('username', PARAM_RAW);
         $mform->addRule('username', get_string('missingusername'), 'required', null, 'client');
 
         if (!empty($CFG->passwordpolicy)){
diff --git a/user/editadvanced_form.php b/user/editadvanced_form.php
index 57f7e7d581f..8814be11f10 100644
--- a/user/editadvanced_form.php
+++ b/user/editadvanced_form.php
@@ -98,7 +98,7 @@ class user_editadvanced_form extends moodleform {
 
         $mform->addElement('text', 'username', get_string('username'), 'size="20"');
         $mform->addHelpButton('username', 'username', 'auth');
-        $mform->setType('username', core_user::get_property_type('username'));
+        $mform->setType('username', PARAM_RAW);
 
         if ($userid !== -1) {
             $mform->disabledIf('username', 'auth', 'in', $cannotchangeusername);