Re-add login buttons
Merge branch 'hotfix/fix_missed_merge_tags'