Fix signin
Merge commit 'e95b98f'