diff --git a/VERSION b/VERSION
index 80f6d0c2..4b8679fb 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.0.6 (2012-09-03 08:17:01) stable
+Version 2.0.6 (2012-09-03 08:47:06) stable
diff --git a/applications/admin/views/default.mobile/index.html b/applications/admin/views/default.mobile/index.html
index 1b775d18..90f02961 100644
--- a/applications/admin/views/default.mobile/index.html
+++ b/applications/admin/views/default.mobile/index.html
@@ -2,7 +2,9 @@
 
 <h2>web2py&trade; {{=T('Web Framework')}}</h2>
 <h3>{{=T('Login to the Administrative Interface')}}</h3>
-<div>
+
+{{if request.is_https or request.is_local:}}
+<div class="form">
   <form action="{{=URL(r=request)}}" method="post">
     <div><input type="hidden" name="send" value="{{=send}}"/></div>
     <table>
@@ -11,4 +13,6 @@
     </table>
   </form>
 </div>
-
+{{else:}}
+<p class="help">{{=T('ATTENTION: Login requires a secure (HTTPS) connection or running on localhost.')}}</p>
+{{pass}}