User authentication tweaks #35