Fixed org signup (closes #30)