SIGN IN SIGN UP

Merge AIX fixes from 3.6

M
Martin Panter committed
5e17ad971693da3a16f839ef300e9e263688a319