better handling of spaces during completion
handle account completion separately