diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php
index d6bcf0a942bd..2c96584d6227 100644
--- a/resources/lang/en/texts.php
+++ b/resources/lang/en/texts.php
@@ -2453,6 +2453,7 @@ $LANG = array(
     'refresh' => 'Refresh',
     'filter_sort' => 'Filter/Sort',
     'no_description' => 'No Description',
+    'time_tracker_login' => 'Time Tracker Login',
 
 );
 
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index 5347df59fd10..0e13c9227d40 100644
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -10,7 +10,13 @@
                 ->rules(['email' => 'required|email', 'password' => 'required'])
                 ->addClass('form-signin') !!}
 
-        <h2 class="form-signin-heading">{{ trans('texts.account_login') }}</h2>
+        <h2 class="form-signin-heading">
+            @if (strstr(session('url.intended'), 'time_tracker'))
+                {{ trans('texts.time_tracker_login') }}
+            @else
+                {{ trans('texts.account_login') }}
+            @endif
+        </h2>
         <hr class="green">
 
         @if (count($errors->all()))
@@ -83,7 +89,7 @@
         </div>
         {!! Former::close() !!}
 
-        @if(Utils::allowNewAccounts())
+        @if (Utils::allowNewAccounts() && ! strstr(session('url.intended'), 'time_tracker'))
             <div class="row sign-up">
                 <div class="col-md-3 col-md-offset-3 col-xs-12">
                     <h3>{{trans('texts.not_a_member_yet')}}</h3>
diff --git a/resources/views/tasks/time_tracker.blade.php b/resources/views/tasks/time_tracker.blade.php
index de9d0506c8cb..be1a9b7eae8d 100644
--- a/resources/views/tasks/time_tracker.blade.php
+++ b/resources/views/tasks/time_tracker.blade.php
@@ -62,6 +62,24 @@
         .list-group-item-type7:before { background-color: #a87821; }
         .list-group-item-type8:before { background-color: #676767; }
 
+		body {
+			/* Margin bottom by footer height */
+			margin-bottom: 60px;
+		}
+
+		.footer {
+			position: fixed;
+			bottom: 0;
+			width: 100%;
+			height: 60px;
+			background-color: #313131;
+			color: white;
+			border-top-width: 3px;
+			border-top-color: #aaa;
+			border-top-style: ridge;
+		}
+
+
     </style>
 
 @stop
@@ -196,6 +214,12 @@
         </div>
     </div>
 
+	<footer class="footer">
+		<div style="padding-left: 16px; padding-top: 16px;">
+			<div data-bind="text: statistics"></div>
+		</div>
+	</footer>
+
 	@include('tasks.time_tracker_knockout')
 
     <script type="text/javascript">
@@ -329,6 +353,12 @@
 			$('.archive-dropdown:not(.dropdown-toggle)').click(function() {
 				model.onArchiveClick();
 			});
+
+			/*
+			$( window ).scroll(function() {
+				$('.footer').
+			});
+			*/
         });
 
     </script>
diff --git a/resources/views/tasks/time_tracker_knockout.blade.php b/resources/views/tasks/time_tracker_knockout.blade.php
index 3b7f903c1afb..f78336809ee8 100644
--- a/resources/views/tasks/time_tracker_knockout.blade.php
+++ b/resources/views/tasks/time_tracker_knockout.blade.php
@@ -171,6 +171,10 @@
             }, 1000);
         }
 
+        self.statistics = ko.computed(function() {
+            return 'tst';
+        });
+
         self.showArchive = ko.computed(function() {
             var task = self.selectedTask();
             if (! task) {
@@ -521,7 +525,6 @@
         }
 
         self.age = ko.computed(function() {
-            model.clock(); // bind to the clock
             if (! self.time_log().length) {
                 return '';
             }