More trimming on login