More login work
Guard against empty token