Fixing https://github.com/CakeDC/users/issues/60
Fixing https://github.com/CakeDC/users/issues/60

omnuvito/users,ristorantino/users,eleiva/users,ristorantino/users,yaelsprikut/users,davalb/users,phlyper/users