diff --git a/servicePoints/views/__pycache__/accounts.cpython-36.pyc b/servicePoints/views/__pycache__/accounts.cpython-36.pyc
index 8d68f269c8a49b7934f908bc8884916922c227eb..e717c9c740dd3fc38e388768906081600b17fd87 100644
Binary files a/servicePoints/views/__pycache__/accounts.cpython-36.pyc and b/servicePoints/views/__pycache__/accounts.cpython-36.pyc differ
diff --git a/servicePoints/views/accounts.py b/servicePoints/views/accounts.py
index 0e38fd8a55ad9b02e6a19af923effdb4b9dfb146..0ea090b3977be4f97237f7d1c31cfb9080dc2895 100644
--- a/servicePoints/views/accounts.py
+++ b/servicePoints/views/accounts.py
@@ -233,7 +233,8 @@ def index():
         leaderCur = cursor.execute('SELECT orgName FROM orgs WHERE '
                     'username =:who',
                     {"who": username})
-        if leaderCur.fetchone() is None:
+        tryfetch = leaderCur.fetchone()
+        if tryfetch is None or tryfetch["orgName"] == "NONE":
             leader = 0
         else:
             leader = 1
@@ -345,10 +346,14 @@ def profile():
         orgName = str(flask.request.form['orgName'])
         username = str(flask.session['username'])
         cur = servicePoints.model.get_db()
+        curOrg =          cur.execute('SELECT orgName FROM users WHERE username = ?',
+                                    (username,))
+        org = curOrg.fetchone()
         cur.execute('UPDATE users SET orgName = ? WHERE username = ?',
                                     (orgName, username,))
-        cur.execute('DELETE from orgs WHERE username = ?',
-                                    (username,))
+        if org == "NONE":
+            cur.execute('DELETE from orgs WHERE username = ?',
+                                        (username,))
         leadercur = cur.execute('SELECT username from orgs WHERE orgName = ?',
                                     (orgName,))
         leader = leadercur.fetchone()                            
diff --git a/var/servicePoints.sqlite3 b/var/servicePoints.sqlite3
index 7e902472bdd1db5dde5b5971e4e42731a9aee50f..bf426cb1ca7b04a0d73fa1d08fcf065e2379ac4e 100644
Binary files a/var/servicePoints.sqlite3 and b/var/servicePoints.sqlite3 differ