[#59] Authenticated system fixes and refactors