WIP: Store credentials only in session if required

:warning: WIP DO NOT MERGE :warning:
Good point - will change.