SIGN IN SIGN UP

Merge #6498 fix from 3.1.

G
Georg Brandl committed
318e62153baf1162130fb85e06caf64bbd5a7916