Service/listener changes. Login design - not done