fixes #87
fixes admin issues, refs #85