In-line if statement
Merge branch 'hotfix-user-deletion-logout-only-when-user'