Fix the other thing!
Merge branch 'nalanda' into nalanda-rct2
Don't slice the user id if there is no user id, just to be safe.