diff --git a/blechreiz/calendarCredentials.dat b/blechreiz/calendarCredentials.dat
index 32a5754..efd1a9e 100644
--- a/blechreiz/calendarCredentials.dat
+++ b/blechreiz/calendarCredentials.dat
@@ -1 +1 @@
-{"_module": "oauth2client.client", "token_expiry": "2014-04-26T10:33:34Z", "access_token": "ya29.1.AADtN_WzqSiT0Ir0jy8f_InaX_NAUAs98E5YwU_uHYMMCvhfc90boeQSVPQpJQTWHw", "token_uri": "https://accounts.google.com/o/oauth2/token", "invalid": false, "token_response": {"access_token": "ya29.1.AADtN_WzqSiT0Ir0jy8f_InaX_NAUAs98E5YwU_uHYMMCvhfc90boeQSVPQpJQTWHw", "token_type": "Bearer", "expires_in": 3600}, "client_id": "34462582242-4kpdvvbi27ajt4u22uitqurpve9o8ipj.apps.googleusercontent.com", "id_token": null, "client_secret": "y4t9XBrJdCODPTO5UvtONWWn", "revoke_uri": "https://accounts.google.com/o/oauth2/revoke", "_class": "OAuth2Credentials", "refresh_token": "1/7-6-m_lLAKX8IeD7OuGtkcIiprty_nZUSxhMunSC5b0", "user_agent": null}
\ No newline at end of file
+{"_module": "oauth2client.client", "token_expiry": "2014-06-20T09:36:07Z", "access_token": "ya29.LgA4Q4jhQqjEoBwAAABv_luKCAgrb2C-s1IcYmGZ8nZViS_QHvHKT-IkSo31RQ", "token_uri": "https://accounts.google.com/o/oauth2/token", "invalid": false, "token_response": {"access_token": "ya29.LgA4Q4jhQqjEoBwAAABv_luKCAgrb2C-s1IcYmGZ8nZViS_QHvHKT-IkSo31RQ", "token_type": "Bearer", "expires_in": 3600}, "client_id": "34462582242-4kpdvvbi27ajt4u22uitqurpve9o8ipj.apps.googleusercontent.com", "id_token": null, "client_secret": "y4t9XBrJdCODPTO5UvtONWWn", "revoke_uri": "https://accounts.google.com/o/oauth2/revoke", "_class": "OAuth2Credentials", "refresh_token": "1/7-6-m_lLAKX8IeD7OuGtkcIiprty_nZUSxhMunSC5b0", "user_agent": null}
\ No newline at end of file
diff --git a/eventplanner/serializers.py b/eventplanner/serializers.py
index f7cd4b0..509126e 100644
--- a/eventplanner/serializers.py
+++ b/eventplanner/serializers.py
@@ -12,8 +12,7 @@ class ParticipationSerializer(serializers.ModelSerializer):
     def get_identity(self, data):
         """  This hook is required for bulk update.  """
         try:
-            print "get_identity event:" + str( data.get('event', None) )  + " user " + str( data.get('user') )
-            return ( data.get('event', None), data.get('user') )
+            return data.get('event', None), data.get('user')
         except AttributeError:
             return None
 
diff --git a/eventplanner_gcal/google_sync.py b/eventplanner_gcal/google_sync.py
index 22ffc6a..57f3894 100644
--- a/eventplanner_gcal/google_sync.py
+++ b/eventplanner_gcal/google_sync.py
@@ -4,11 +4,12 @@ import datetime
 import time
 
 from eventplanner.models import  Event, EventParticipation
-from eventplanner_gcal.models import GCalMapping, GCalPushChannel
+from eventplanner_gcal.models import GCalMapping, GCalPushChannel,UserGCalCoupling
 from apiclient.http import BatchHttpRequest
 
 from django.contrib.auth.models import User
 from django.conf import settings
+from pprint import pprint
 
 logger = logging.getLogger(__name__)
 
@@ -54,21 +55,22 @@ def buildGCalAttendeesObj( event ):
     """Builds a attendees object that is inserted into the GCal event.
        Attendees are all users that have a google mail address. """
     result = []
-    for u in User.objects.all():
-        if u.email.endswith( "@gmail.com") or u.email.endswith("@googlemail.com"):
-            participation = EventParticipation.get_or_create( u, event )
-            status = "tentative"
-            if participation.status == 'Yes':  status = "accepted"
-            if participation.status == 'No' :  status = "declined"
 
-            o = {
-                'id': u.email,
-                'email': u.email,
-                'displayName': u.username,
-                'comment': participation.comment,
-                'responseStatus': status,
-            }
-            result.append( o )
+    for userMapping in UserGCalCoupling.objects.all():
+        u = userMapping.user
+        participation = EventParticipation.get_or_create( u, event )
+        status = "tentative"
+        if participation.status == 'Yes':  status = "accepted"
+        if participation.status == 'No' :  status = "declined"
+
+        o = {
+            'id': userMapping.email,
+            'email': u.email,
+            'displayName': u.username,
+            'comment': participation.comment,
+            'responseStatus': status,
+        }
+        result.append( o )
 
     return result
 
@@ -222,6 +224,9 @@ def syncFromLocalToGoogle( service = None ):
         eventDjangoID = int( gcalEv['extendedProperties']['private']['blechreizID'] )
         try:
             djangoEv = Event.objects.get( pk=eventDjangoID )
+            if  'attendees' not in gcalEv:
+                gcalEv['attendees'] = []
+
             if gcalEv['attendees'] != buildGCalAttendeesObj( djangoEv ):
                 batch.add( updateGCalEvent( service, djangoEv ) )
                 batchIsEmpty = False
diff --git a/eventplanner_gcal/models.py b/eventplanner_gcal/models.py
index b764ced..40d087a 100644
--- a/eventplanner_gcal/models.py
+++ b/eventplanner_gcal/models.py
@@ -1,6 +1,8 @@
 import logging
 import uuid
 from eventplanner.models import Event
+from django.contrib.auth.models import User
+
 
 from apiclient.channel import Channel
 from django.db import models
@@ -9,6 +11,12 @@ from django.db import models
 logger = logging.getLogger(__name__)
 
 
+class UserGCalCoupling( models.Model ):
+    # For every user in this table the gcal coupling is activated
+    user  = models.OneToOneField( User )
+    email = models.CharField( max_length=1024 )
+
+
 class GCalMapping( models.Model ):
     """Mapping between event id at google and local event id"""
     gcal_id = models.CharField( max_length=64 )
diff --git a/eventplanner_gcal/signals.py b/eventplanner_gcal/signals.py
index f2c319e..7cd5927 100644
--- a/eventplanner_gcal/signals.py
+++ b/eventplanner_gcal/signals.py
@@ -9,10 +9,10 @@ import logging
 logger = logging.getLogger( __name__ )
 
 
-@receiver( post_save, sender=User )
-def user_changed( **kwargs ):
-    logger.info("Synchronizing with google - user information changed")
-    syncFromLocalToGoogle( getServiceObject() )
+#@receiver( post_save, sender=User )
+#def user_changed( **kwargs ):
+#    logger.info("Synchronizing with google - user information changed")
+#    syncFromLocalToGoogle( getServiceObject() )
 
 
 @receiver( post_save,sender= Event)
diff --git a/eventplanner_gcal/static/css/bootstrap-switch.css b/eventplanner_gcal/static/css/bootstrap-switch.css
new file mode 100644
index 0000000..5104c20
--- /dev/null
+++ b/eventplanner_gcal/static/css/bootstrap-switch.css
@@ -0,0 +1,184 @@
+/* ========================================================================
+ * bootstrap-switch - v2.0.1
+ * http://www.bootstrap-switch.org
+ * ========================================================================
+ * Copyright 2012-2013 Mattia Larentis
+ *
+ * ========================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ========================================================================
+ */
+
+.has-switch {
+  display: inline-block;
+  cursor: pointer;
+  border-radius: 4px;
+  border: 1px solid;
+  border-color: #cccccc;
+  position: relative;
+  text-align: left;
+  overflow: hidden;
+  line-height: 8px;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  -o-user-select: none;
+  user-select: none;
+  vertical-align: middle;
+  min-width: 100px;
+  -webkit-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
+  transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
+}
+.has-switch:focus {
+  border-color: #66afe9;
+  outline: 0;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, 0.6);
+  box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, 0.6);
+}
+.has-switch.switch-mini {
+  min-width: 72px;
+}
+.has-switch.switch-mini span,
+.has-switch.switch-mini label {
+  padding-bottom: 4px;
+  padding-top: 4px;
+  font-size: 10px;
+  line-height: 9px;
+}
+.has-switch.switch-mini i.switch-mini-icons {
+  height: 1.20em;
+  line-height: 9px;
+  vertical-align: text-top;
+  text-align: center;
+  transform: scale(0.6);
+  margin-top: -1px;
+  margin-bottom: -1px;
+}
+.has-switch.switch-small {
+  min-width: 80px;
+}
+.has-switch.switch-small span,
+.has-switch.switch-small label {
+  padding-bottom: 3px;
+  padding-top: 3px;
+  font-size: 12px;
+  line-height: 18px;
+}
+.has-switch.switch-large {
+  min-width: 120px;
+}
+.has-switch.switch-large span,
+.has-switch.switch-large label {
+  padding-bottom: 9px;
+  padding-top: 9px;
+  font-size: 16px;
+  line-height: normal;
+}
+.has-switch.switch-animate > div {
+  -webkit-transition: left 0.5s;
+  transition: left 0.5s;
+}
+.has-switch.switch-off > div {
+  left: -50%;
+}
+.has-switch.switch-on > div {
+  left: 0%;
+}
+.has-switch.disabled {
+  opacity: 0.5;
+  filter: alpha(opacity=50);
+  cursor: default !important;
+}
+.has-switch.disabled span,
+.has-switch.disabled label {
+  cursor: default !important;
+}
+.has-switch > div {
+  display: inline-block;
+  width: 150%;
+  position: relative;
+  top: 0;
+  -webkit-transform: translate3d(0, 0, 0);
+  transform: translate3d(0, 0, 0);
+}
+.has-switch input[type=radio],
+.has-switch input[type=checkbox] {
+  display: none;
+}
+.has-switch span,
+.has-switch label {
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+  cursor: pointer;
+  position: relative;
+  display: inline-block !important;
+  height: 100%;
+  padding-bottom: 4px;
+  padding-top: 4px;
+  font-size: 14px;
+  line-height: 20px;
+}
+.has-switch label {
+  text-align: center;
+  margin-top: -1px;
+  margin-bottom: -1px;
+  z-index: 100;
+  width: 33.333333333%;
+  background: #ffffff;
+}
+.has-switch label i {
+  color: #000;
+  text-shadow: 0 1px 0 #fff;
+  line-height: 18px;
+  pointer-events: none;
+}
+.has-switch span {
+  text-align: center;
+  z-index: 1;
+  width: 33.333333333%;
+}
+.has-switch span.switch-left {
+  color: #f00;
+  border-bottom-left-radius: 4px;
+  border-top-left-radius: 4px;
+}
+.has-switch span.switch-right {
+  color: #000;
+  background: #eeeeee;
+}
+.has-switch span.switch-primary,
+.has-switch span.switch-left {
+  color: #fff;
+  background: #428bca;
+}
+.has-switch span.switch-info {
+  color: #fff;
+  background: #5bc0de;
+}
+.has-switch span.switch-success {
+  color: #fff;
+  background: #5cb85c;
+}
+.has-switch span.switch-warning {
+  background: #f0ad4e;
+  color: #fff;
+}
+.has-switch span.switch-danger {
+  color: #fff;
+  background: #d9534f;
+}
+.has-switch span.switch-default {
+  color: #000;
+  background: #eeeeee;
+}
diff --git a/eventplanner_gcal/static/css/bootstrap-switch.min.css b/eventplanner_gcal/static/css/bootstrap-switch.min.css
new file mode 100644
index 0000000..2bc64af
--- /dev/null
+++ b/eventplanner_gcal/static/css/bootstrap-switch.min.css
@@ -0,0 +1,22 @@
+/* ========================================================================
+ * bootstrap-switch - v2.0.1
+ * http://www.bootstrap-switch.org
+ * ========================================================================
+ * Copyright 2012-2013 Mattia Larentis
+ *
+ * ========================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ========================================================================
+ */
+
+.clearfix{*zoom:1}.clearfix:after,.clearfix:before{display:table;content:"";line-height:0}.clearfix:after{clear:both}.hide-text{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.input-block-level{display:block;width:100%;min-height:30px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.has-switch{display:inline-block;cursor:pointer;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;border:1px solid;border-color:rgba(0,0,0,.1) rgba(0,0,0,.1) rgba(0,0,0,.25);position:relative;text-align:left;overflow:hidden;line-height:8px;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;-o-user-select:none;user-select:none;vertical-align:middle;min-width:100px;-webkit-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;-moz-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;-o-transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s;transition:border-color ease-in-out .15s,box-shadow ease-in-out .15s}.has-switch.switch-mini{min-width:72px}.has-switch.switch-mini label,.has-switch.switch-mini span{padding-bottom:4px;padding-top:4px;font-size:10px;line-height:9px}.has-switch.switch-mini i.switch-mini-icons{height:1.2em;line-height:9px;vertical-align:text-top;text-align:center;transform:scale(0.6);margin-top:-1px;margin-bottom:-1px}.has-switch.switch-small{min-width:80px}.has-switch.switch-small label,.has-switch.switch-small span{padding-bottom:3px;padding-top:3px;font-size:12px;line-height:18px}.has-switch.switch-large{min-width:120px}.has-switch.switch-large label,.has-switch.switch-large span{padding-bottom:9px;padding-top:9px;font-size:16px;line-height:normal}.has-switch.switch-animate>div{-webkit-transition:left .5s;-moz-transition:left .5s;-o-transition:left .5s;transition:left .5s}.has-switch.switch-off>div{left:-50%}.has-switch.switch-on>div{left:0}.has-switch.disabled{opacity:.5;filter:alpha(opacity=50);cursor:default!important}.has-switch.disabled label,.has-switch.disabled span{cursor:default!important}.has-switch:focus{border-color:#08c;outline:0;-webkit-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(red(@btnPrimaryBackground),green(@btnPrimaryBackground),blue(@btnPrimaryBackground),.6);-moz-box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(red(@btnPrimaryBackground),green(@btnPrimaryBackground),blue(@btnPrimaryBackground),.6);box-shadow:inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(red(@btnPrimaryBackground),green(@btnPrimaryBackground),blue(@btnPrimaryBackground),.6)}.has-switch>div{display:inline-block;width:150%;position:relative;top:0}.has-switch input[type=checkbox],.has-switch input[type=radio]{display:none}.has-switch label,.has-switch span{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;cursor:pointer;position:relative;display:inline-block!important;height:100%;padding-bottom:4px;padding-top:4px;font-size:14px;line-height:20px}.has-switch label{text-align:center;margin-top:-1px;margin-bottom:-1px;z-index:100;width:34%;border-left:1px solid #ccc;border-right:1px solid #ccc;color:#333;text-shadow:0 -1px 0 rgba(0,0,0,.25);background-color:#f5f5f5;background-image:-moz-linear-gradient(top,#fff,#e6e6e6);background-image:-webkit-gradient(linear,0 0,0 100%,from(#fff),to(#e6e6e6));background-image:-webkit-linear-gradient(top,#fff,#e6e6e6);background-image:-o-linear-gradient(top,#fff,#e6e6e6);background-image:linear-gradient(to bottom,#fff,#e6e6e6);background-repeat:repeat-x;border-color:#e6e6e6 #e6e6e6 #bfbfbf;border-color:rgba(0,0,0,.1) rgba(0,0,0,.1) rgba(0,0,0,.25);*background-color:#e6e6e6;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.has-switch label.active,.has-switch label.disabled,.has-switch label:active,.has-switch label:focus,.has-switch label:hover,.has-switch label[disabled]{color:#333;background-color:#e6e6e6;*background-color:#d9d9d9}.has-switch label.active,.has-switch label:active{background-color:#ccc \9}.has-switch label i{color:#000;text-shadow:0 1px 0 #fff;line-height:18px;pointer-events:none}.has-switch span{text-align:center;z-index:1;width:33%}.has-switch span.switch-left{-webkit-border-top-left-radius:4px;-moz-border-radius-topleft:4px;border-top-left-radius:4px;-webkit-border-bottom-left-radius:4px;-moz-border-radius-bottomleft:4px;border-bottom-left-radius:4px}.has-switch span.switch-right{color:#333;text-shadow:0 1px 1px rgba(255,255,255,.75);background-color:#f0f0f0;background-image:-moz-linear-gradient(top,#e6e6e6,#fff);background-image:-webkit-gradient(linear,0 0,0 100%,from(#e6e6e6),to(#fff));background-image:-webkit-linear-gradient(top,#e6e6e6,#fff);background-image:-o-linear-gradient(top,#e6e6e6,#fff);background-image:linear-gradient(to bottom,#e6e6e6,#fff);background-repeat:repeat-x;border-color:#fff #fff #d9d9d9;border-color:rgba(0,0,0,.1) rgba(0,0,0,.1) rgba(0,0,0,.25);*background-color:#fff;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.has-switch span.switch-right.active,.has-switch span.switch-right.disabled,.has-switch span.switch-right:active,.has-switch span.switch-right:focus,.has-switch span.switch-right:hover,.has-switch span.switch-right[disabled]{color:#333;background-color:#fff;*background-color:#f2f2f2}.has-switch span.switch-right.active,.has-switch span.switch-right:active{background-color:#e6e6e6 \9}.has-switch span.switch-left,.has-switch span.switch-primary{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,.25);background-color:#005fcc;background-image:-moz-linear-gradient(top,#04c,#08c);background-image:-webkit-gradient(linear,0 0,0 100%,from(#04c),to(#08c));background-image:-webkit-linear-gradient(top,#04c,#08c);background-image:-o-linear-gradient(top,#04c,#08c);background-image:linear-gradient(to bottom,#04c,#08c);background-repeat:repeat-x;border-color:#08c #08c #005580;border-color:rgba(0,0,0,.1) rgba(0,0,0,.1) rgba(0,0,0,.25);*background-color:#08c;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.has-switch span.switch-left.active,.has-switch span.switch-left.disabled,.has-switch span.switch-left:active,.has-switch span.switch-left:focus,.has-switch span.switch-left:hover,.has-switch span.switch-left[disabled],.has-switch span.switch-primary.active,.has-switch span.switch-primary.disabled,.has-switch span.switch-primary:active,.has-switch span.switch-primary:focus,.has-switch span.switch-primary:hover,.has-switch span.switch-primary[disabled]{color:#fff;background-color:#08c;*background-color:#0077b3}.has-switch span.switch-left.active,.has-switch span.switch-left:active,.has-switch span.switch-primary.active,.has-switch span.switch-primary:active{background-color:#069 \9}.has-switch span.switch-info{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,.25);background-color:#41a7c5;background-image:-moz-linear-gradient(top,#2f96b4,#5bc0de);background-image:-webkit-gradient(linear,0 0,0 100%,from(#2f96b4),to(#5bc0de));background-image:-webkit-linear-gradient(top,#2f96b4,#5bc0de);background-image:-o-linear-gradient(top,#2f96b4,#5bc0de);background-image:linear-gradient(to bottom,#2f96b4,#5bc0de);background-repeat:repeat-x;border-color:#5bc0de #5bc0de #28a1c5;border-color:rgba(0,0,0,.1) rgba(0,0,0,.1) rgba(0,0,0,.25);*background-color:#5bc0de;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.has-switch span.switch-info.active,.has-switch span.switch-info.disabled,.has-switch span.switch-info:active,.has-switch span.switch-info:focus,.has-switch span.switch-info:hover,.has-switch span.switch-info[disabled]{color:#fff;background-color:#5bc0de;*background-color:#46b8da}.has-switch span.switch-info.active,.has-switch span.switch-info:active{background-color:#31b0d5 \9}.has-switch span.switch-success{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,.25);background-color:#58b058;background-image:-moz-linear-gradient(top,#51a351,#62c462);background-image:-webkit-gradient(linear,0 0,0 100%,from(#51a351),to(#62c462));background-image:-webkit-linear-gradient(top,#51a351,#62c462);background-image:-o-linear-gradient(top,#51a351,#62c462);background-image:linear-gradient(to bottom,#51a351,#62c462);background-repeat:repeat-x;border-color:#62c462 #62c462 #3b9e3b;border-color:rgba(0,0,0,.1) rgba(0,0,0,.1) rgba(0,0,0,.25);*background-color:#62c462;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.has-switch span.switch-success.active,.has-switch span.switch-success.disabled,.has-switch span.switch-success:active,.has-switch span.switch-success:focus,.has-switch span.switch-success:hover,.has-switch span.switch-success[disabled]{color:#fff;background-color:#62c462;*background-color:#4fbd4f}.has-switch span.switch-success.active,.has-switch span.switch-success:active{background-color:#42b142 \9}.has-switch span.switch-warning{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,.25);background-color:#f9a123;background-image:-moz-linear-gradient(top,#f89406,#fbb450);background-image:-webkit-gradient(linear,0 0,0 100%,from(#f89406),to(#fbb450));background-image:-webkit-linear-gradient(top,#f89406,#fbb450);background-image:-o-linear-gradient(top,#f89406,#fbb450);background-image:linear-gradient(to bottom,#f89406,#fbb450);background-repeat:repeat-x;border-color:#fbb450 #fbb450 #f89406;border-color:rgba(0,0,0,.1) rgba(0,0,0,.1) rgba(0,0,0,.25);*background-color:#fbb450;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.has-switch span.switch-warning.active,.has-switch span.switch-warning.disabled,.has-switch span.switch-warning:active,.has-switch span.switch-warning:focus,.has-switch span.switch-warning:hover,.has-switch span.switch-warning[disabled]{color:#fff;background-color:#fbb450;*background-color:#faa937}.has-switch span.switch-warning.active,.has-switch span.switch-warning:active{background-color:#fa9f1e \9}.has-switch span.switch-danger{color:#fff;text-shadow:0 -1px 0 rgba(0,0,0,.25);background-color:#d14641;background-image:-moz-linear-gradient(top,#bd362f,#ee5f5b);background-image:-webkit-gradient(linear,0 0,0 100%,from(#bd362f),to(#ee5f5b));background-image:-webkit-linear-gradient(top,#bd362f,#ee5f5b);background-image:-o-linear-gradient(top,#bd362f,#ee5f5b);background-image:linear-gradient(to bottom,#bd362f,#ee5f5b);background-repeat:repeat-x;border-color:#ee5f5b #ee5f5b #e51d18;border-color:rgba(0,0,0,.1) rgba(0,0,0,.1) rgba(0,0,0,.25);*background-color:#ee5f5b;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.has-switch span.switch-danger.active,.has-switch span.switch-danger.disabled,.has-switch span.switch-danger:active,.has-switch span.switch-danger:focus,.has-switch span.switch-danger:hover,.has-switch span.switch-danger[disabled]{color:#fff;background-color:#ee5f5b;*background-color:#ec4844}.has-switch span.switch-danger.active,.has-switch span.switch-danger:active{background-color:#e9322d \9}.has-switch span.switch-default{color:#333;text-shadow:0 1px 1px rgba(255,255,255,.75);background-color:#f0f0f0;background-image:-moz-linear-gradient(top,#e6e6e6,#fff);background-image:-webkit-gradient(linear,0 0,0 100%,from(#e6e6e6),to(#fff));background-image:-webkit-linear-gradient(top,#e6e6e6,#fff);background-image:-o-linear-gradient(top,#e6e6e6,#fff);background-image:linear-gradient(to bottom,#e6e6e6,#fff);background-repeat:repeat-x;border-color:#fff #fff #d9d9d9;border-color:rgba(0,0,0,.1) rgba(0,0,0,.1) rgba(0,0,0,.25);*background-color:#fff;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.has-switch span.switch-default.active,.has-switch span.switch-default.disabled,.has-switch span.switch-default:active,.has-switch span.switch-default:focus,.has-switch span.switch-default:hover,.has-switch span.switch-default[disabled]{color:#333;background-color:#fff;*background-color:#f2f2f2}.has-switch span.switch-default.active,.has-switch span.switch-default:active{background-color:#e6e6e6 \9}
\ No newline at end of file
diff --git a/eventplanner_gcal/static/img/google_cal.png b/eventplanner_gcal/static/img/google_cal.png
new file mode 100644
index 0000000..65de6ee
Binary files /dev/null and b/eventplanner_gcal/static/img/google_cal.png differ
diff --git a/eventplanner_gcal/static/js/bootstrap-switch.min.js b/eventplanner_gcal/static/js/bootstrap-switch.min.js
new file mode 100644
index 0000000..81dfa14
--- /dev/null
+++ b/eventplanner_gcal/static/js/bootstrap-switch.min.js
@@ -0,0 +1,22 @@
+/* ========================================================================
+ * bootstrap-switch - v2.0.1
+ * http://www.bootstrap-switch.org
+ * ========================================================================
+ * Copyright 2012-2013 Mattia Larentis
+ *
+ * ========================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ========================================================================
+ */
+
+(function(){!function(a){return a.fn.bootstrapSwitch=function(b){var c;return c={init:function(){return this.each(function(){var b,c,d,e,f,g,h,i;return c=a(this),f=a("<span>",{"class":"switch-left",html:function(){var a,b;return a="ON",b=c.data("on-label"),null!=b&&(a=b),a}}),g=a("<span>",{"class":"switch-right",html:function(){var a,b;return a="OFF",b=c.data("off-label"),null!=b&&(a=b),a}}),e=a("<label>",{"for":c.attr("id"),html:function(){var a,b,d;return a="&nbsp;",b=c.data("label-icon"),d=c.data("text-label"),null!=b&&(a='<i class="icon '+b+'"></i>'),null!=d&&(a=d),a}}),b=a("<div>"),h=a("<div>",{"class":"has-switch",tabindex:0}),d=c.closest("form"),i=function(){return e.hasClass("label-change-switch")?void 0:e.trigger("mousedown").trigger("mouseup").trigger("click")},c.data("bootstrap-switch",!0),null!=c.data("on")&&f.addClass("switch-"+c.data("on")),null!=c.data("off")&&g.addClass("switch-"+c.data("off")),h.data("animated",!1),c.data("animated")!==!1&&h.addClass("switch-animate").data("animated",!0),b=c.wrap(b).parent(),h=b.wrap(h).parent(),c.attr("class")&&a.each(["switch-mini","switch-small","switch-large"],function(a,b){return c.attr("class").indexOf(b)>=0?h.addClass(b):void 0}),c.before(f).before(e).before(g),h.addClass(c.is(":checked")?"switch-on":"switch-off"),(c.is(":disabled")||c.is("[readonly]"))&&h.addClass("disabled"),c.on("keydown",function(a){return 32===a.keyCode?(a.stopImmediatePropagation(),a.preventDefault(),i()):void 0}).on("change",function(a,d){var e,f;return e=c.is(":checked"),f=h.hasClass("switch-off"),a.preventDefault(),b.css("left",""),f!==e||(e?h.removeClass("switch-off").addClass("switch-on"):h.removeClass("switch-on").addClass("switch-off"),h.data("animated")!==!1&&h.addClass("switch-animate"),"boolean"==typeof d&&d)?void 0:c.trigger("switch-change",{el:c,value:e})}),h.on("keydown",function(a){if(a.which&&!c.is(":disabled")&&!c.is("[readonly]"))switch(a.which){case 32:return a.preventDefault(),i();case 37:if(a.preventDefault(),c.is(":checked"))return i();break;case 39:if(a.preventDefault(),!c.is(":checked"))return i()}}),f.on("click",function(){return i()}),g.on("click",function(){return i()}),e.on("mousedown touchstart",function(a){var d;return d=!1,a.preventDefault(),a.stopImmediatePropagation(),h.removeClass("switch-animate"),c.is(":disabled")||c.is("[readonly]")||c.hasClass("radio-no-uncheck")?e.unbind("click"):e.on("mousemove touchmove",function(a){var c,e,f,g;return f=(a.pageX||a.originalEvent.targetTouches[0].pageX)-h.offset().left,e=f/h.width()*100,c=25,g=75,d=!0,c>e?e=c:e>g&&(e=g),b.css("left",e-g+"%")}).on("click touchend",function(a){return a.stopImmediatePropagation(),a.preventDefault(),e.unbind("mouseleave"),d?c.prop("checked",parseInt(e.parent().css("left"),10)>-25):c.prop("checked",!c.is(":checked")),d=!1,c.trigger("change")}).on("mouseleave",function(a){return a.preventDefault(),a.stopImmediatePropagation(),e.unbind("mouseleave mousemove").trigger("mouseup"),c.prop("checked",parseInt(e.parent().css("left"),10)>-25).trigger("change")}).on("mouseup",function(a){return a.stopImmediatePropagation(),a.preventDefault(),e.trigger("mouseleave")})}),d.data("bootstrap-switch")?void 0:d.bind("reset",function(){return window.setTimeout(function(){return d.find(".has-switch").each(function(){var b;return b=a(this).find("input"),b.prop("checked",b.is(":checked")).trigger("change")})},1)}).data("bootstrap-switch",!0)})},setDisabled:function(b){var c,d;return c=a(this),d=c.parents(".has-switch"),b?(d.addClass("disabled"),c.prop("disabled",!0)):(d.removeClass("disabled"),c.prop("disabled",!1)),c},toggleDisabled:function(){var b;return b=a(this),b.prop("disabled",!b.is(":disabled")).parents(".has-switch").toggleClass("disabled"),b},isDisabled:function(){return a(this).is(":disabled")},setReadOnly:function(b){var c,d;return c=a(this),d=c.parents(".has-switch"),b?(d.addClass("disabled"),c.prop("readonly",!0)):(d.removeClass("disabled"),c.prop("readonly",!1)),c},toggleReadOnly:function(){var b;return b=a(this),b.prop("readonly",!b.is("[readonly]")).parents(".has-switch").toggleClass("disabled"),b},isReadOnly:function(){return a(this).is("[readonly]")},toggleState:function(b){var c;return c=a(this),c.prop("checked",!c.is(":checked")).trigger("change",b),c},toggleRadioState:function(b){var c;return c=a(this),c.not(":checked").prop("checked",!c.is(":checked")).trigger("change",b),c},toggleRadioStateAllowUncheck:function(b,c){var d;return d=a(this),b?d.not(":checked").trigger("change",c):d.not(":checked").prop("checked",!d.is(":checked")).trigger("change",c),d},setState:function(b,c){var d;return d=a(this),d.prop("checked",b).trigger("change",c),d},setOnLabel:function(b){var c;return c=a(this),c.siblings(".switch-left").html(b),c},setOffLabel:function(b){var c;return c=a(this),c.siblings(".switch-right").html(b),c},setOnClass:function(b){var c,d,e;return c=a(this),d=c.siblings(".switch-left"),e=c.attr("data-on"),null!=b?(null!=e&&d.removeClass("switch-"+e),d.addClass("switch-"+b),c):void 0},setOffClass:function(b){var c,d,e;return c=a(this),d=c.siblings(".switch-right"),e=c.attr("data-off"),null!=b?(null!=e&&d.removeClass("switch-"+e),d.addClass("switch-"+b),c):void 0},setAnimated:function(b){var c,d;return c=a(this),d=c.parents(".has-switch"),null==b&&(b=!1),d.data("animated",b).attr("data-animated",b)[d.data("animated")!==!1?"addClass":"removeClass"]("switch-animate"),c},setSizeClass:function(b){var c,d;return c=a(this),d=c.parents(".has-switch"),a.each(["switch-mini","switch-small","switch-large"],function(a,c){return d[c!==b?"removeClass":"addClass"](c)}),c},setTextLabel:function(b){var c;return c=a(this),c.siblings("label").html(b||"&nbsp"),c},setTextIcon:function(b){var c;return c=a(this),c.siblings("label").html(b?'<i class="icon '+b+'"></i>':"&nbsp;"),c},state:function(){return a(this).is(":checked")},destroy:function(){var b,c,d;return c=a(this),b=c.parent(),d=b.closest("form"),b.children().not(c).remove(),c.unwrap().unwrap().off("change"),d.length&&d.off("reset").removeData("bootstrap-switch"),c}},c[b]?c[b].apply(this,Array.prototype.slice.call(arguments,1)):"object"!=typeof b&&b?a.error("Method "+b+" does not exist!"):c.init.apply(this,arguments)},this}(jQuery)}).call(this);
\ No newline at end of file
diff --git a/eventplanner_gcal/templates/eventplanner_gcal/management.html b/eventplanner_gcal/templates/eventplanner_gcal/management.html
new file mode 100644
index 0000000..d1aa058
--- /dev/null
+++ b/eventplanner_gcal/templates/eventplanner_gcal/management.html
@@ -0,0 +1,110 @@
+{% extends "website/base.html" %}
+{% load sekizai_tags staticfiles %}
+
+{% block content %}
+
+    {% addtoblock "css" strip  %}
+        <link rel="stylesheet" href="{{STATIC_URL}}/css/bootstrap-switch.min.css" type="text/css" media="screen" />
+    {% endaddtoblock %}
+
+    {% addtoblock "css" %}
+        <style>
+            h5 {
+                padding-top: 20px;
+            }
+            #errorlabel {
+                color: red;
+                margin: 10px;
+                font-size: 12px;
+            }
+            #activate {
+                margin-top: 30px;
+            }
+        </style>
+
+    {% endaddtoblock %}
+
+    {% addtoblock "js" strip %}
+        <script src="{{STATIC_URL}}/js/bootstrap-switch.min.js"></script>
+    {% endaddtoblock %}
+
+    {% addtoblock "js" %}
+        <script>
+            $("[name='my-checkbox']").bootstrapSwitch();
+
+            function endsWith(str, suffix) {
+               return str.indexOf(suffix, str.length - suffix.length) !== -1;
+            }
+            validateEmail = function() {
+                if ( endsWith( $("#id_email").val(), "@gmail.com") ||
+                     endsWith( $("#id_email").val(), "@googlemail.com")   ) {
+                    // Activate submit button
+                    $("#activate").prop("disabled", false);
+                    $("#errorlabel").html("");
+                } else {
+                    $("#activate").prop("disabled", true);
+                    $("#errorlabel").html("Erlaubte Endung: <em>@gmail.com</em> oder<em>@googlemail.com</em>");
+                }
+            }
+
+            $("#id_email").change( validateEmail );
+            validateEmail();
+
+        </script>
+    {% endaddtoblock %}
+
+
+
+
+    <div class="container">
+	    <div class="row">
+            <div class="span12">
+                 <h2>Google Kalender Anbindung</h2>
+            </div>
+
+
+            <div class="span6">
+                <p>
+                    <h5>NEU</h5>
+                    Die Blechreiz Termine können jetzt automatisch in den eigenen Google Kalender übernommen werden.
+                    Auch vom Google Kalender aus kann man sich dann für Termine eintragen, direkt vom Handy oder Tablet aus.
+                </p>
+
+                <p>
+                    <h5>SO GEHTS:</h5>
+                    Einfach die eigene Google Mail Adresse angeben und die Kopplung aktivieren.
+                </p>
+
+
+                <h5>KOPPLUNG:</h5>
+
+
+
+                <form method="POST" >
+                    {% csrf_token %}
+
+                    {% if enabled %}
+                        Kopplung aktiviert für <em>{{ mail }}</em>.
+                        <input type="hidden" name="activate" value="0" >
+                        <br><br>
+                        <input class="btn btn-primary" value="Deaktivieren" type="submit">
+                    {% else %}
+                        <input type="hidden" name="activate" value="1" >
+                        <label for="id_email">Email:</label>
+                        <input id="id_email" type="text"  placeholder="GMail Adresse" name="email">
+                        <br>
+                        <span id="errorlabel"></span>
+                        <br>
+                        <input id="activate" class="btn btn-primary" value="Aktivieren" type="submit">
+                    {% endif %}
+
+                </form>
+            </div>
+
+            <div class="span3 offset1">
+                <img src="{{STATIC_URL}}/img/google_cal.png">
+            </div>
+        </div>
+    </div>
+
+{% endblock %}
\ No newline at end of file
diff --git a/eventplanner_gcal/urls.py b/eventplanner_gcal/urls.py
index 3902b87..86c613c 100644
--- a/eventplanner_gcal/urls.py
+++ b/eventplanner_gcal/urls.py
@@ -1,9 +1,10 @@
 from django.conf.urls import patterns, url
 
-from views import runSync, gcalApiCallback
+from views import runSync, gcalApiCallback, manage
 
 urlpatterns = patterns('',
     url(r'^runSync$',            runSync         ),
     url(r'^gcalApiCallback$',    gcalApiCallback ),
+    url(r'^manage$',             manage          ),
 )
 
diff --git a/eventplanner_gcal/views.py b/eventplanner_gcal/views.py
index 3e681eb..98252d1 100644
--- a/eventplanner_gcal/views.py
+++ b/eventplanner_gcal/views.py
@@ -4,6 +4,8 @@ from django.http import HttpResponse
 from django.views.decorators.csrf import csrf_exempt
 from pprint import pformat
 from eventplanner_gcal.google_sync import checkIfGoogleCallbackIsValid
+from eventplanner_gcal.models import UserGCalCoupling
+from django.shortcuts import render
 
 import logging
 
@@ -14,6 +16,29 @@ def runSync( request ):
     syncFromLocalToGoogle()
     return redirect("/")
 
+
+def manage( request ):
+
+    if request.method == 'POST':
+        if request.POST['activate'] == "1":
+            UserGCalCoupling.objects.filter( user=request.user ).delete()
+            c = UserGCalCoupling( user=request.user, email = request.POST['email'] )
+            c.save()
+            syncFromLocalToGoogle()
+        else:
+            UserGCalCoupling.objects.filter( user=request.user ).delete()
+            syncFromLocalToGoogle()
+
+    context = {}
+    userCoupling = UserGCalCoupling.objects.filter( user = request.user )
+    context['enabled'] = len(userCoupling)
+    assert( len(userCoupling) < 2 )
+    if len(userCoupling) == 1:
+        context['mail'] = userCoupling[0].email
+
+    return render( request, 'eventplanner_gcal/management.html', context )
+
+
 @csrf_exempt
 def gcalApiCallback( request ):
     # TODO check channel info here
diff --git a/musicians/templates/musicians/login.html b/musicians/templates/musicians/login.html
index c780fe0..1bbffdb 100644
--- a/musicians/templates/musicians/login.html
+++ b/musicians/templates/musicians/login.html
@@ -43,7 +43,12 @@
 		        	if ( data['redirect']) {
 		        		window.location.href = data['redirect'];
 		        	}
-		        }
+		        },
+                error: function( jqXHR, text1, text2 ) {
+                    console.log( jqXHR );
+                    console.log( text1 );
+                    console.log( text2 );
+                }
 		    });
 		    e.preventDefault();             
 		});
diff --git a/website/static/img/slides/osterhase.png b/website/static/img/slides/osterhase.png
deleted file mode 100644
index 15391e7..0000000
Binary files a/website/static/img/slides/osterhase.png and /dev/null differ
diff --git a/website/templates/website/base.html b/website/templates/website/base.html
index a4b90b1..61b3841 100644
--- a/website/templates/website/base.html
+++ b/website/templates/website/base.html
@@ -48,6 +48,7 @@
 	                        </a>
 	                        <ul class="dropdown-menu">
   	               				<li><a href="/musicians/profile">Eigenes Profil</a></li>
+                                <li><a href="/eventplanner_gcal/manage">Google Kalender</a></li>
   	               				<li><a href="/musicians/changePassword">Passwort ändern</a> </li>
 	                            <li><a href="/musicians/logout">  Logout</a></li>
 	                        </ul>
diff --git a/website/templates/website/slider_intern_area.html b/website/templates/website/slider_intern_area.html
index 0dcd271..077c14d 100644
--- a/website/templates/website/slider_intern_area.html
+++ b/website/templates/website/slider_intern_area.html
@@ -76,13 +76,12 @@
 
 <section id="feature_slider" class="">
 
-	<article class="slide" id="slide_news"
-		style="background: url('{{STATIC_URL}}/img/slides/osterhase.png') repeat-x top center;">
+	<article class="slide" id="slide_news" style="background: url('{{STATIC_URL}}/img/slides/aqua.jpg') repeat-x top center;">
 
-        <img class="asset left-30 sp600 t150 z1" src="{{STATIC_URL}}/img/googleCalNew.png" />
+        <img class="asset left-30 sp600 t150 z1" src="{{STATIC_URL}}/img/google_cal.png" />
 		<div class="info">
-			<a href="/musicians/profile">GoogleCalendar</a>
-			<div class="subtitle subtitlebg">Jetzt auch auf dem Handy im GoogleCalendar Termine planen: Einfach im Profil eine Google Email Adresse eintragen...</div>
+			<a href="/eventplanner_gcal/manage">GoogleCalendar</a>
+			<div class="subtitle subtitlebg">Jetzt auch auf dem Handy im Google Kalender Termine planen</div>
 		</div>
 
 	</article>