remove dependancy on user model having a username field