Fixed some blank input issues in client