fixed login flow/added class inheritance