Issue 3811 unverified signin

@6a68, @jrgm - here is PR #3817 re-issued against dev.

fixes #3811