--- a/index.xhtml
+++ b/index.xhtml
@@ -42,7 +42,8 @@
 <form id="connection">
 <label>JID: <input type="email" id="jid" placeholder="you@your-server.tld"/></label><br/>
 <label>Password: <input type="password" id="pass" placeholder="Password"/></label><br/>
-<input type="submit" id="connect" value="connect"/> <img src="spinner.svg" width="24" height="24" id="spinner" hidden=""/>
+<input type="submit" id="connect" value="connect"/>
+<img src="spinner.svg" width="24" height="24" id="connect-spinner" hidden=""/>
 </form>
 </div>
 
@@ -53,6 +54,7 @@
 <h2>Nickname</h2>
 <p>
 <label>Nickname: <input id="nick" placeholder="Nick"/></label>
+<img src="spinner.svg" width="24" height="24" id="nick-spinner"/>
 </p>
 <h2>Avatar</h2>
 <p>