diff --git a/app/scripts/components/library/library-hosting-create.components.jsx b/app/scripts/components/library/library-hosting-create.components.jsx
index 0c6e09678..edf7afa7c 100644
--- a/app/scripts/components/library/library-hosting-create.components.jsx
+++ b/app/scripts/components/library/library-hosting-create.components.jsx
@@ -13,11 +13,16 @@ export default class LibraryHostingCreate extends React.Component {
 			autocompleteText: '',
 			autocompleteSuggestions: [],
 			addedFonts: [],
+			errors: {
+				domain: false,
+				hostedFonts: false,
+			},
 		};
 		this.updateAutocompleteSuggestions = this.updateAutocompleteSuggestions.bind(
 			this,
 		);
 		this.addSuggestion = this.addSuggestion.bind(this);
+		this.addWebsite = this.addWebsite.bind(this);
 	}
 	async componentWillMount() {
 		this.client = LocalClient.instance();
@@ -40,6 +45,13 @@ export default class LibraryHostingCreate extends React.Component {
 			let preset;
 			let family;
 
+			this.setState({
+				errors: {
+					domain: false,
+					hostedFonts: false,
+				},
+			});
+
 			switch (suggestion.type) {
 			case 'Template':
 				templateData = this.state.templatesData.find(
@@ -196,6 +208,45 @@ export default class LibraryHostingCreate extends React.Component {
 		});
 	}
 
+	addWebsite() {
+		const domain = this.state.domain
+			.replace('http://', '')
+			.replace('https://', '')
+			.split(/[/?#]/)[0]
+			.toLowerCase()
+			.normalize('NFD')
+			.replace(/[\u0300-\u036f]/g, '');
+
+		this.setState({domain});
+		const isUrl = /^([a-zA-Z0-9]+(([\-]?[a-zA-Z0-9]+)*\.)+)*[a-zA-Z]{2,}$/;
+
+		if (!isUrl.test(domain)) {
+			this.setState({
+				errors: {
+					domain: true,
+					hostedFonts: false,
+				},
+			});
+			return;
+		}
+
+		if (this.state.addedFonts.length === 0) {
+			this.setState({
+				errors: {
+					domain: false,
+					hostedFonts: true,
+				},
+			});
+			return;
+		}
+		this.setState({
+			errors: {
+				domain: false,
+				hostedFonts: false,
+			},
+		});
+	}
+
 	render() {
 		return (
 			<div className="library-content-wrapper">
@@ -215,12 +266,25 @@ export default class LibraryHostingCreate extends React.Component {
 									id="domain"
 									name="hosting_domain"
 									placeholder="www.mysite.com"
-									className="library-hosting-form-elem-input-big"
+									className={`library-hosting-form-elem-input-big ${
+										this.state.errors.domain ? 'is-error' : ''
+									}`}
 									value={this.state.domain}
 									onChange={(e) => {
-										this.setState({domain: e.target.value});
+										this.setState({
+											domain: e.target.value,
+											errors: {
+												...this.state.errors,
+												domain: false,
+											},
+										});
 									}}
 								/>
+								{this.state.errors.domain && (
+									<p className="library-hosting-form-elem-error">
+										The domain you entered is incorrect. Please re-check it.
+									</p>
+								)}
 							</div>
 							<div className="library-hosting-form-elem">
 								<label htmlFor="list">Hosted fonts</label>
@@ -256,6 +320,11 @@ export default class LibraryHostingCreate extends React.Component {
 											</div>
 										))
 									)}
+									{this.state.errors.domain && (
+										<p className="library-hosting-form-elem-error">
+											Please add at least one font to your website.
+										</p>
+									)}
 								</div>
 							</div>
 							<div className="library-hosting-form-elem">
@@ -300,7 +369,12 @@ export default class LibraryHostingCreate extends React.Component {
 								)}
 							</div>
 							<div className="library-hosting-form-elem">
-								<div className="library-hosting-form-button" onClick={() => {}}>
+								<div
+									className="library-hosting-form-button"
+									onClick={() => {
+										this.addWebsite();
+									}}
+								>
 									Add website
 								</div>
 							</div>
diff --git a/app/styles/components/library.scss b/app/styles/components/library.scss
index f3745d248..ec1b46530 100644
--- a/app/styles/components/library.scss
+++ b/app/styles/components/library.scss
@@ -334,6 +334,12 @@
 						&.library-hosting-form-elem-input-big {
 							padding: 15px 30px;
 							font-size: 50px;
+							transition: all .2s ease;
+							&.is-error {
+								border-color: $red;
+								border-width: 2px;
+								color: $medium-grey;
+							}
 						}
 						&:focus {
 							outline: none;
@@ -376,6 +382,10 @@
 							}
 						}
 					}
+					.library-hosting-form-elem-error {
+						color: $red;
+						font-weight: bold;
+					}
 				}
 			}
 			.library-details-form {