Prevent identity theft
Reorganized controller specs
Made the specs green again