Fixed issues with Custom User Model and migrations #336 #335 #335