Admin works, fixes issue #65