diff --git a/js/src/ui/IdentityName/identityName.js b/js/src/ui/IdentityName/identityName.js
index ca56bcacf..11e7c7d96 100644
--- a/js/src/ui/IdentityName/identityName.js
+++ b/js/src/ui/IdentityName/identityName.js
@@ -18,6 +18,8 @@ import React, { Component, PropTypes } from 'react';
 import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
 
+const defaultName = 'UNNAMED';
+
 class IdentityName extends Component {
   static propTypes = {
     address: PropTypes.string,
@@ -38,14 +40,14 @@ class IdentityName extends Component {
     }
 
     const addressFallback = shorten ? this.formatHash(address) : address;
-    const fallback = unknown ? 'UNNAMED' : addressFallback;
+    const fallback = unknown ? defaultName : addressFallback;
     const isUuid = hasAccount && account.name === account.uuid;
     const name = hasAccount && !isUuid
-      ? account.name.toUpperCase()
+      ? account.name.toUpperCase().trim()
       : fallback;
 
     return (
-      <span>{ name }</span>
+      <span>{ name && name.length ? name : fallback }</span>
     );
   }
 
diff --git a/js/src/util/validation.js b/js/src/util/validation.js
index 1ec7489f8..243217077 100644
--- a/js/src/util/validation.js
+++ b/js/src/util/validation.js
@@ -81,7 +81,7 @@ export function validateCode (code, api) {
 }
 
 export function validateName (name) {
-  const nameError = !name || name.length < 2 ? ERRORS.invalidName : null;
+  const nameError = !name || name.trim().length < 2 ? ERRORS.invalidName : null;
 
   return {
     name,