[FIX] Register: text fixes, try 2
Merge pull request #1289 from annatonger/fix/textfixtry2

[FIX] Register: text fixes, try 2