Index: branches/1.2/content/main_language.php
===================================================================
--- branches/1.2/content/main_language.php	(revision 1226)
+++ branches/1.2/content/main_language.php	(revision 1227)
@@ -115,9 +115,11 @@
 $lang["main_user_account_update_unexpected_error"] = "Sorry, there has been an unexpected error";
 $lang["main_user_account_update_password_error_old"] = "Your old password doesn't match our records";
-$lang["main_user_account_update_password_error_new"] = "The new password must be at least 8 characters and can only contain letters, numbers and these symbols: @ * # - _";
+$lang["main_user_account_update_password_error_new"] = "The new password must be at least 8 characters and can only contain letters, numbers and these symbols: ! @ * # - _";
 $lang["main_user_account_update_password_error_match"] = "The two \"New password\" fields don't match";
-$lang["main_user_account_update_password_error_not_provided"] = "Please fill in all the password fields with at least 8 characters";
+$lang["main_user_account_update_password_error_not_provided"] = "Please fill in all the password fields with at least 8 letters, numbers and these symbols: ! @ * # - _";
 $lang["main_user_account_update_username_error"] = "Your username must be at least 4 characters and can contain letters, dashes and underscores only";
-$lang["main_user_account_update_password_error"] = "The password must be at least 8 characters and can only contain letters, numbers and these symbols: @ * # - _";
+$lang["main_user_account_update_password_error"] = "The password must be at least 8 characters and can only contain letters, numbers and these symbols: ! @ * # - _";
+$lang["main_user_account_username_requirements"] = "At least 4 characters, using only letters, dashes and underscores";
+$lang["main_user_account_password_requirements"] = "At least 8 characters, using only letters, numbers and these symbols: ! @ * # - _";
 $lang['main_user_account_update_password_match_error'] = "The password fields don't match";
 $lang["main_user_account_update_email_error"] = "That doesn't parse as a valid email address";