Fix base sign_in and sign_up

Closed Valery Sizov requested to merge settings_getter_fix into master