Added saving of username