signedin refactor
fixed conflicts