Add extra check if username has a value during the command interception