Updated username auth logic on @rxl's suggestion