 
                 self.createEvent newEvent
 
-                newMonth = if newEvent.month? then $.inArray newEvent.month, self.months else self.currentMonth
-                if newMonth isnt currentMonth then self.changeCalendar.call @, newMonth, newEvent.eventDate, self.currentYear
+                newMonth = if newEvent.month? then $.inArray newEvent.month, self.months else self.today.month
+
+                if newMonth isnt currentMonth
+                    currentDate =
+                        month: newMonth
+                        date: newEvent.eventDate
+                        year: self.today.year
+
+                    self.changeCalendar.call @, currentDate
+
                 # reset form
                 fields = self.addEventForm.find(':input').not('button[type=submit]').val ''
                 self.clearForm fields                

            calendar = $ '<div></div>',
                class: self.calendarInnerClass
                html: weekdays + weeks
                'data-month': currentMonth
                'data-year': currentYear

            heading = $ '<h1></h1>',
                class: 'drm-calendar-header'
                text: "#{self.months[currentMonth]} #{currentYear}"
            
            calendar.appendTo ".#{self.calendarClass}"
            heading.prependTo ".#{self.calendarInnerClass}"

            _highlightCurrentDay()
            _highlightWeekends()
            _addWeekNumbers()


                        j += 1
                    # start adding cells for the current month
                    while j <= self.daysPerWeek
                        weeks += "<td class='#{self.classes.date}' data-month='#{currentDate.month}' data-date='#{currentDate.date}' 
                            data-year='#{currentDate.year}' data-day='#{j - 1}'>#{currentDate.date}</td>"
                        j += 1
                        currentDate.date += 1
                # if we are in the last week of the month we need to add blank cells for next month
                else if i is numberWeeks
                    while j <= self.daysPerWeek
                        # finish adding cells for the current month
                        if currentDate.date <= numberDays
                            weeks += "<td class='#{self.classes.date}' data-month='#{currentDate.month}' data-date='#{currentDate.date}' 
                                data-year='#{currentDate.year}' data-day='#{j - 1}'>#{currentDate.date}</td>"
                        # start adding cells for next month
                        else
                            weeks += "<td class='#{self.classes.muted}' data-day='#{j}'>#{nextDates}</td>"
                            nextDates += 1
                        j += 1
                        currentDate.date += 1
                else
                    # if we are in the middle of the month add cells for the current month
                    while j <= self.daysPerWeek
                        weeks += "<td class='#{self.classes.date}' data-month='#{currentDate.month}' data-date='#{currentDate.date}' 
                            data-year='#{currentDate.year}' data-day='#{j - 1}'>#{currentDate.date}</td>"
                        j += 1
                        currentDate.date += 1
                weeks += '</tr>'
                i += 1
            weeks += '</tbody></table>'
