added upstream merge back into composer and fixed login default route in config

Signed-off-by: Daniel Berry <danie@danielberry.me>