fixed login issue (removed wrapping listener) and cleaned up
fixed conflict