diff --git a/js/components/NewSuggestion.js b/js/components/NewSuggestion.js
index b4a37f6..1ead116 100644
--- a/js/components/NewSuggestion.js
+++ b/js/components/NewSuggestion.js
@@ -102,11 +102,17 @@ module.exports = React.createClass({
 	render: function() {
 		var attendeeList = this.getAttendeeList();
 		var buttonDisabled = this.state.attendee == null || !this.state.suggestion;
+		var suggestionLabel = "Add Suggestion To:";
+		var byLabel = "Suggested By:"
+		if (Object.keys(this.props.suggestions).length > 0) {
+			suggestionLabel = "Veto With:";
+			byLabel = "Vetoed By:"
+		}
 		return (
 			<Row>
 			<Col xs={4}>
 				<FormGroup controlId="newsuggestionrestaurantname">
-				<ControlLabel>Add Suggestion/Veto To:</ControlLabel>
+				<ControlLabel>{suggestionLabel}</ControlLabel>
 				<Combobox
 					value={this.state.suggestion}
 					data={this.unusedPopularSuggestions()}
@@ -118,7 +124,7 @@ module.exports = React.createClass({
 			<Col xs={1}></Col>
 			<Col xs={4}>
 				<FormGroup controlId="newsuggestionby">
-				<ControlLabel>Suggested By:</ControlLabel>
+				<ControlLabel>{byLabel}</ControlLabel>
 				<Combobox
 					value={this.state.attendee}
 					data={attendeeList}
diff --git a/js/components/TopBar.js b/js/components/TopBar.js
index 3255133..dcc58df 100644
--- a/js/components/TopBar.js
+++ b/js/components/TopBar.js
@@ -43,7 +43,7 @@ const LoginBar = React.createClass({
 					<Col xs={4}></Col>
 					<Col xs={2}>
 						<Button bsStyle="link"
-							onClick={this.handleNewUserSubmit}>Create New User</Button>
+							onClick={this.handleNewUserSubmit}>New User</Button>
 					</Col>
 					<Col xs={2}>
 						<FormControl type="text"