Fixed service bug, added login