Fixed username bugs