User authentication tweaks