Add lookup and user name change functionality