diff --git a/features/device-mgt-iot-feature/org.wso2.carbon.device.mgt.iot.feature/src/main/resources/jaggeryapps/devicemgt/app/units/iot.unit.user.sign-in/sign-in.hbs b/features/device-mgt-iot-feature/org.wso2.carbon.device.mgt.iot.feature/src/main/resources/jaggeryapps/devicemgt/app/units/iot.unit.user.sign-in/sign-in.hbs
index 9792da2d52..4ab4ff871b 100644
--- a/features/device-mgt-iot-feature/org.wso2.carbon.device.mgt.iot.feature/src/main/resources/jaggeryapps/devicemgt/app/units/iot.unit.user.sign-in/sign-in.hbs
+++ b/features/device-mgt-iot-feature/org.wso2.carbon.device.mgt.iot.feature/src/main/resources/jaggeryapps/devicemgt/app/units/iot.unit.user.sign-in/sign-in.hbs
@@ -1,44 +1,5 @@
-<div class="container col-md-12 col-lg-3 col-centered wr-content wr-login col-centered">
-
-    <p class="page-sub-title">Login</p>
-    <hr/>
-    <!-- validation -->
-        <span class="wr-validation-summary hidden">
-                <p>Login failed. Check your credentials and try again.</p>
-        </span>
-    <div class="panel-body">
-        <form id="signInForm" method="POST"
-              class="{{defineZone "signInForm-class" scope="protected"}}"
-              action="{{@app.context}}/api/user/login">
-            <div class="wr-input-control">
-                <label class="wr-input-label">Username *</label>
-                <input type="text" name="username" class="form-control" placeholder="User Name"
-                       id="username" autofocus="autofocus" />
-            </div>
-            <div class="wr-input-control">
-                <label class="wr-input-label">Password *</label>
-                <input type="password" name="password" class="form-control"
-                       id="password" placeholder="Password" />
-            </div>
-            <div class="wr-input-control wr-btn-grp">
-                <button class="wr-btn btn-download-agent" id="signIn">&nbsp;&nbsp;&nbsp;&nbsp;Login&nbsp;&nbsp;&nbsp;&nbsp;</button>
-            </div>
-            <div class="form-group">
-                {{#if showRememberMe}}
-                    <span class="pull-left">
-                            <input type="checkbox" name="rememberMe" value="remember"> Remember me
-                        </span>
-                {{/if}}
-                {{#if showCreateAccount}}
-                    <a id="createAccount"
-                       href="{{@app.context}}/register"
-                       class="pull-right create-account">Create an account</a>
-                {{/if}}
-            </div>
-        </form>
+{{#zone "signInForm-below"}}
+    <div id="register-link-wrapper" style="float: right; padding-top: 10px;">
+        <a href="{{@app.context}}/register" class="pull-right create-account">Create an account</a>
     </div>
-</div>
-</div>
-{{#zone "bottomLoginJs"}}
-    {{js "js/login.js" }}
 {{/zone}}