feature/utils: Added login boolean to keep track of. Altered regex slightly to make more sense