Brownju/bug/47 - rebased

This is @Chetco's branch brought up to / merged with current develop.

Fixes #47
Shouldn't there be some sort of error output after the rollback, to indicate the admin was not created?