diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageTemplate.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageTemplate.html
index 570a3009b45..b6da50ba2b9 100644
--- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageTemplate.html
+++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageTemplate.html
@@ -78,41 +78,48 @@
     <!-- BOOTSTRAP RESOURCES END -->
 </head>
 <body>
-
-<div id="blackWindow"></div>
-<div id="xmlExport">
-	<span id="xmlExportContent"></span>
-</div>
-
-<div wicket:id="topMenu" />
-
-<div wicket:id="version" class="pull-right version-info">
-    <wicket:message key="pageBase.midPointVersion"/>
-</div>
-<img id="ajax_busy" class="pull-right version-info" src="img/ajax-loader.gif"/>
-
-<div class="row mainContainer">
-    <div class="page-header" wicket:id="pageTitleContainer">
-        <h1 wicket:id="pageTitle">
-            <span wicket:id="pageTitleReal"></span>
-            <small wicket:id="pageSubtitle"></small>
-        </h1>
+    <div id="blackWindow"></div>
+    <div id="xmlExport">
+        <span id="xmlExportContent"></span>
     </div>
 
-    <!--<div wicket:id="feedbackList"/>-->
-    <!--<div wicket:id="feedbackDetails"/>-->
+    <div wicket:id="topMenu" />
 
-    <div wicket:id="feedbackContainer" class="feedbackContainer">
-        <div wicket:id="feedback" class="messagePanel"/>
-        <div wicket:id="tempFeedback" class="tempMessage"/>
+    <div wicket:id="version" class="pull-right version-info">
+        <wicket:message key="pageBase.midPointVersion"/>
+    </div>
+    <img id="ajax_busy" class="pull-right version-info" src="img/ajax-loader.gif"/>
+
+    <div class="mp-main-container">
+        <div class="row mainContainer">
+            <div class="page-header" wicket:id="pageTitleContainer">
+                <h1 wicket:id="pageTitle">
+                    <span wicket:id="pageTitleReal"></span>
+                    <small wicket:id="pageSubtitle"></small>
+                </h1>
+            </div>
+
+            <!--<div wicket:id="feedbackList"/>-->
+            <!--<div wicket:id="feedbackDetails"/>-->
+
+            <div wicket:id="feedbackContainer" class="feedbackContainer">
+                <div wicket:id="feedback" class="messagePanel"/>
+                <div wicket:id="tempFeedback" class="tempMessage"/>
+            </div>
+            <wicket:child/>
+
+        </div>
+
+        <div class="wicket-debug-buttons" wicket:id="debugBar">
+            <a wicket:id="clearCssCache">Clear css cache</a>
+        </div>
+        <div wicket:id="debugPanel" style="z-index: 10000;"/>
     </div>
-    <wicket:child/>
 
-</div>
+    <!-- Footer -->
+    <div class="mp-footer">
+        <br>&copy;&nbsp;2015&nbsp;<a href="https://www.evolveum.com/">Evolveum</a>&nbsp;,&nbsp;Open Source Identity Management<br>
+    </div>
 
-<div class="wicket-debug-buttons" wicket:id="debugBar">
-    <a wicket:id="clearCssCache">Clear css cache</a>
-</div>
-<div wicket:id="debugPanel" style="z-index: 10000;"/>
 </body>
 </html>
\ No newline at end of file
diff --git a/gui/admin-gui/src/main/webapp/less/midpoint/midpoint.less b/gui/admin-gui/src/main/webapp/less/midpoint/midpoint.less
index 3c7b714f95f..e3adcd01ce5 100755
--- a/gui/admin-gui/src/main/webapp/less/midpoint/midpoint.less
+++ b/gui/admin-gui/src/main/webapp/less/midpoint/midpoint.less
@@ -16,6 +16,29 @@
 @import "tree-theme-basic.less";
 @import "operation-result.less";
 
+/**
+ *  Overall styles for correct footer behaviour
+ */
+ html {
+    height: 100%;
+ }
+
+ body{
+    min-height:100%;
+    position:relative;
+ }
+
+ div.mp-main-container{
+    height:100%;
+ }
+
+ div.mp-footer{
+    position: absolute;
+    bottom: 0;
+    text-align: center;
+    width: 100%;
+ }
+
 /**
  *  Auto-complete drop-down choice styles
  */
