[Issue #208][WIP] Salma added or in the sign in