MIFOSX-1391 Removing multiple creation screens for client and groups