--- a/swtr.py
+++ b/swtr.py
@@ -47,6 +47,14 @@
             return False
     return True
 
+def getUsers():
+    db = g.connection[app.config['DATABASE']]
+    coll = db['sweet_users']
+    users = []
+    for i in coll.find():
+        users.append(i['user'])
+    return users
+
 @app.before_request
 def init_db():
     g.connection = Connection(app.config['DB_HOST'], app.config['DB_PORT'])




@@ -172,26 +180,45 @@
 @app.route('/serveUser')
 def serveUser():
     if "logged_in" in session:
-        print session["logged_in"]
+        #print session["logged_in"]
         session['key'] = conf.SECRET_KEY
         return render_template('user.html')
     else:
         return render_template('login.html', error=None)
 
-@app.route('/user', methods=['POST', "GET"])
-def user():
+@app.route('/user/', methods=['POST', 'GET'])
+@app.route('/user/<user_id>', methods=['GET'])
+def user(user_id='all'):
     if request.method == 'POST':
         response = make_response()
         db = g.connection[app.config['DATABASE']]
         collection = db['sweet_users']
-        collection.insert({'user':request.form["user"],"key":request.form["key"]})
+
+        # check if user already exists
+        if request.form['user'] in getUsers():
+            #print 'user already exists!'
+            flash('User already exists!')
+            return redirect(url_for('serveUser'))
+
+        # else insert new user
+        collection.insert({'user': request.form['user'],
+                           'key': request.form['key']})
+        response.status_code = 200
+        response.data = 'User added.'
         return response
+
     elif request.method == 'GET':
         db = g.connection[app.config['DATABASE']]
         collection = db['sweet_users']
         users = []
-        for user in collection.find():
-            users.append(user['user'])
+        if user_id == 'all':
+            users = getUsers()
+        else:
+            user = collection.find_one({'user': user_id})
+            if user:
+                users.append(user['user'])
+            else:
+                abort(404)
         return render_template("users.html", users=users)
 
 
@@ -220,9 +247,8 @@
     for row in res:
         d = row
         d['id'] = str(row['_id'])
-        # d['text'] = row['text']
-        # d["title"] = row["title"]
-        # d["user"] = row["user"]
+        if d['who'] in getUsers():
+            d['registered'] = True
         entries.append(d)
     return entries
 
--- a/templates/show_entries.html
+++ b/templates/show_entries.html
@@ -5,7 +5,14 @@
     {% for entry in entries %}
 	    {% if entry.who %}
       <li>
-        @<b>{{ entry.who }}</b>
+        {% if entry.registered %}
+        <b>
+          <a href="/user/{{ entry.who }}">@{{ entry.who }}</a>
+        </b>
+        {% else %}
+        <b>@{{ entry.who }}</b>
+        {% endif %}
+
         <b>#{{ entry.what }}</b> /{{ entry.where }} {{ entry.how|safe }}
         {% if entry.created|len > 0 %}
           <small>created: {{entry.created }} UTC</small>
--- a/templates/user.html
+++ b/templates/user.html
@@ -34,9 +34,11 @@
 {% if session.logged_in %}
 <div class="form-signin">
   <h2 class="form-signin-heading">Please create a user and assign a key</h2>
-  <input type=text id="user" name=user class="input-block-level" placeholder="Name">
-  <input id="password" class="input-block-level" type=password size=30 name=title placeholder="Password">
-  <button class="btn btn-large btn-primary" type=submit onclick="encryptAndSend();">Submit</button>
+  <form method="POST" action="/user/">
+    <input type="text" id="user" name="user" class="input-block-level" placeholder="Name">
+    <input id="password" class="input-block-level" type="password" size="30" name="key" placeholder="Password">
+    <input class="btn btn-large btn-primary" type="submit" value="Submit">
+  </form>
 </div>
 {% endif %}
 
--- a/templates/users.html
+++ b/templates/users.html
@@ -4,6 +4,10 @@
   {% for user in users %}
     <p>{{ user }}</p>
   {% endfor %}
+{% elif users|len == 1 %}
+  <p> {{ users[0] }} </p>
+{% else %}
+  <p> You have to login as admin to view this page. </p>
 {% endif %}
 {% endblock %}