Add prevention of changing to blank name