diff --git a/packages/rocketchat-theme/assets/stylesheets/base.less b/packages/rocketchat-theme/assets/stylesheets/base.less
index e2479fb7711739b60faeb5897b2820e2789501b2..5d1cca425875263a5a7e7172c99e5f34ffbba2df 100644
--- a/packages/rocketchat-theme/assets/stylesheets/base.less
+++ b/packages/rocketchat-theme/assets/stylesheets/base.less
@@ -269,6 +269,10 @@ blockquote {
 			font-size: 11px;
 		}
 	}
+	.logoutOthers {
+		text-align: right;
+	}
+
 	.submit {
 		margin-top: 20px;
 		text-align: right;
diff --git a/packages/rocketchat-ui-account/account/accountProfile.coffee b/packages/rocketchat-ui-account/account/accountProfile.coffee
index 375c78f18a6cb0c35d6d48e0f32d77807e6b44ad..688384f5106527afe71c9218604d99482b1c4932 100644
--- a/packages/rocketchat-ui-account/account/accountProfile.coffee
+++ b/packages/rocketchat-ui-account/account/accountProfile.coffee
@@ -42,7 +42,6 @@ Template.accountProfile.onCreated ->
 		@find('#language').value = localStorage.getItem('userLanguage')
 		@find('#oldPassword').value = ''
 		@find('#password').value = ''
-		@find('#username').value = ''
 
 	@changePassword = (oldPassword, newPassword, callback) ->
 		instance = @
diff --git a/packages/rocketchat-ui-account/account/accountProfile.html b/packages/rocketchat-ui-account/account/accountProfile.html
index 68240eb25c99bb6e53fcfebb0986d8f36d0ce891..78982effb13c37657e65ab62bd035c23f029ec98 100644
--- a/packages/rocketchat-ui-account/account/accountProfile.html
+++ b/packages/rocketchat-ui-account/account/accountProfile.html
@@ -19,9 +19,9 @@
 						<label for="username">{{_ "Username"}}</label>
 						<div>
 						{{#if allowUsernameChange}}
-							<input type="text" name="username" id="username" placeholder="{{username}}" />
+							<input type="text" name="username" id="username" value="{{username}}" />
 						{{else}}
-							<input type="text" name="username" id="username" placeholder="{{username}}" readonly="readonly" title="{{usernameChangeDisabled}}" />
+							<input type="text" name="username" id="username" value="{{username}}" readonly="readonly" title="{{usernameChangeDisabled}}" />
 						{{/if}}
 						</div>
 					</div>
@@ -29,9 +29,9 @@
 						<label for="email">{{_ "E-mail"}}</label>
 						<div>
 						{{#if allowEmailChange}}
-							<input type="email" name="email" id="email" placeholder="{{email}}" />
+							<input type="email" name="email" id="email" value="{{email}}" />
 						{{else}}
-							<input type="email" name="email" id="email" placeholder="{{email}}" readonly="readonly" title="{{emailChangeDisabled}}" />
+							<input type="email" name="email" id="email" value="{{email}}" readonly="readonly" title="{{emailChangeDisabled}}" />
 						{{/if}}
 						</div>
 					</div>
@@ -66,12 +66,12 @@
 						</div>
 					</div>
 				</fieldset>
+				<div class="logoutOthers">
+					<button class="button red">{{_ "Logout_Others"}}</button>
+				</div>
 				<div class="submit">
 					<button class="button"><i class="icon-send"></i><span>{{_ "Save_changes"}}</span></button>
 				</div>
-				<div class="logoutOthers">
-					<button class="button">{{_ "Logout_Others"}}</button>
-				</div>
 			</div>
 		</div>
 	</section>