diff --git a/bbb_django/bbb/templates/meetings.html b/bbb_django/bbb/templates/meetings.html
index 5b5d7d4..69cc78f 100644
--- a/bbb_django/bbb/templates/meetings.html
+++ b/bbb_django/bbb/templates/meetings.html
@@ -9,7 +9,7 @@ <h2>{% trans "Meetings" %}</h2>
 {% if meetings %}
     <ul class="large">
     {% for meeting in meetings %}
-        <li>{{ meeting.name }} <a class="more-info">{% trans "view details" %}</a>
+        <li>
             <span class="right">
             {% if meeting.info.started %}
                 {% if meeting.running == 'true' %}
@@ -29,6 +29,7 @@ <h2>{% trans "Meetings" %}</h2>
 	       <form method="GET" action="{% url join meeting.meeting_id%}"><input type="submit" value="{% trans "Start" %}"/></form>
 	    {% endif %}
             </span>
+            {{ meeting.name }} <a class="more-info">{% trans "view details" %}</a>
             <table>
                 {% for item in meeting.info.items %}
                 <tr>
diff --git a/bbb_django/bbb/views/core.py b/bbb_django/bbb/views/core.py
index 763e454..00af59d 100644
--- a/bbb_django/bbb/views/core.py
+++ b/bbb_django/bbb/views/core.py
@@ -165,10 +165,24 @@ def join_meeting(request, meeting_id):
                 meeting.started = True
                 meeting.save()
                 url = meeting.start()
+                return HttpResponseRedirect(Meeting.join_url(meeting_id, name, password))
+            elif password == meeting.attendee_password:
+                if  meeting.started:
+                    return HttpResponseRedirect(Meeting.join_url(meeting_id, name, password))
 
-            return HttpResponseRedirect(Meeting.join_url(meeting_id, name, password))
-    else:
-        form = form_class()
+                else:
+                    #Should start the meeting by moderator first
+                    err_msg = ErrorList([_("Should start the meeting by moderator first")])
+            else:
+                #wrong password
+                err_msg = ErrorList([_("Wrong password")])
+
+
+    form = form_class()
+    if err_msg != '':
+        form.errors['password'] = err_msg
+        #errors = form.errors.setdefault("password", ErrorList())
+        #errors.append(err_msg)    
 
     meeting = Meeting.objects.get(id=meeting_id)
     context = RequestContext(request, {