Hotfix/require login and message