Allow plan to be specified when creating user
Fix retrieval of UserAccountPlan for user where all are inactive