Merge: rev813 (improved login title)