Fix scoping issue on signup