Close #24 Refactored Post Authentication Logic