Login came back

Small code improvments