Reverted for nickname support!?!