Signup bugfix + cleanup