user setup fixes