Login system overhaul with the hope of preventing #60 occuring