Add User Name and "More..." button fix