Slightly improved places in UserApp