From b9e7e243445f94ed75ece2aa016838f3812679b4 Mon Sep 17 00:00:00 2001
From: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Fri, 13 Feb 2015 14:30:24 -0500
Subject: [PATCH] Fixed remember login option

---
 UI/Templates/MainUI/SOGoRootPage.wox     | 6 +++++-
 UI/WebServerResources/js/SOGoRootPage.js | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/UI/Templates/MainUI/SOGoRootPage.wox b/UI/Templates/MainUI/SOGoRootPage.wox
index c086a628c..714fedc2a 100644
--- a/UI/Templates/MainUI/SOGoRootPage.wox
+++ b/UI/Templates/MainUI/SOGoRootPage.wox
@@ -13,6 +13,10 @@
 
 <md-content md-scroll-y="true">
   <div data-ng-controller="loginController">
+
+    <script type="text/javascript">
+      var cookieUsername = '<var:string var:value="cookieUsername" const:escapeHTML="NO"/>';
+    </script>
     <!--   <div id="aboutBox" style="display:none;">
       <div>
         <p class="logo"><img const:alt="SOGo" rsrc:src="img/sogo-logo.png"/></p>
@@ -42,7 +46,7 @@
         <md-input-container>
           <label><var:string label:value="Username:"/>
           </label>
-	  <input type="text" data-ng-model="creds.username" var:data-ng-init='cookieUsername' required="required" />
+	  <input type="text" data-ng-model="creds.username" required="required" />
         </md-input-container>
         <md-input-container>
 	  <label><var:string label:value="Password:"/>
diff --git a/UI/WebServerResources/js/SOGoRootPage.js b/UI/WebServerResources/js/SOGoRootPage.js
index 71dedd9cb..ec97d95e2 100644
--- a/UI/WebServerResources/js/SOGoRootPage.js
+++ b/UI/WebServerResources/js/SOGoRootPage.js
@@ -8,7 +8,7 @@
 
     .controller('loginController', ['$scope', '$mdDialog', 'Authentication', function($scope, $mdDialog, Authentication) {
       $scope.warning = false;
-      $scope.creds = { username: null, password: null };
+      $scope.creds = { username: cookieUsername, password: null };
       $scope.login = function(creds) {
         $scope.warning = false;
         Authentication.login(creds)