Add feature to ensure signup is always working