Polished user handling a bit more. It still needs some work.