diff --git a/alliance_auth/settings.py.corp b/alliance_auth/settings.py.corp
new file mode 100755
index 00000000..2ea65a12
--- /dev/null
+++ b/alliance_auth/settings.py.corp
@@ -0,0 +1,289 @@
+"""
+Django settings for alliance_auth project.
+
+For more information on this file, see
+https://docs.djangoproject.com/en/1.6/topics/settings/
+
+For the full list of settings and their values, see
+https://docs.djangoproject.com/en/1.6/ref/settings/
+"""
+
+# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
+import os
+
+import djcelery
+
+djcelery.setup_loader()
+BASE_DIR = os.path.dirname(os.path.dirname(__file__))
+
+# Quick-start development settings - unsuitable for production
+# See https://docs.djangoproject.com/en/1.6/howto/deployment/checklist/
+
+# SECURITY WARNING: keep the secret key used in production secret!
+SECRET_KEY = os.environ.get('AA_SECRET_KEY', '5xvh4e0x&@-$6(kj%4^80pdo1n5v-!mtx(e(1tw@kn-1le*ts@')
+
+# SECURITY WARNING: don't run with debug turned on in production!
+DEBUG = 'True' == os.environ.get('AA_DEBUG','True')
+
+TEMPLATE_DEBUG = True
+
+ALLOWED_HOSTS = []
+
+BROKER_URL = 'amqp://guest:guest@localhost:5672/'
+
+CELERYBEAT_SCHEDULER = "djcelery.schedulers.DatabaseScheduler"
+
+# Application definition
+INSTALLED_APPS = (
+    'django.contrib.admin',
+    'django.contrib.auth',
+    'django.contrib.contenttypes',
+    'django.contrib.sessions',
+    'django.contrib.messages',
+    'django.contrib.staticfiles',
+    'django.contrib.humanize',
+    'django_evolution',
+    'djcelery',
+    'celerytask',
+    'bootstrapform',
+    'authentication',
+    'portal',
+    'registration',
+    'services',
+    'eveonline',
+    'groupmanagement',
+    'hrapplications',
+    'timerboard',
+    'srp',
+)
+
+MIDDLEWARE_CLASSES = (
+    'django.contrib.sessions.middleware.SessionMiddleware',
+    'django.middleware.common.CommonMiddleware',
+    'django.middleware.csrf.CsrfViewMiddleware',
+    'django.contrib.auth.middleware.AuthenticationMiddleware',
+    'django.contrib.messages.middleware.MessageMiddleware',
+    'django.middleware.clickjacking.XFrameOptionsMiddleware',
+)
+
+ROOT_URLCONF = 'alliance_auth.urls'
+
+WSGI_APPLICATION = 'alliance_auth.wsgi.application'
+
+# Database
+# https://docs.djangoproject.com/en/1.6/ref/settings/#databases
+
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.mysql',
+        'NAME': 'alliance_auth',
+        'USER': os.environ.get('AA_DB_DEFAULT_USER', 'allianceserver'),
+        'PASSWORD': os.environ.get('AA_DB_DEFAULT_PASSWORD', 'potato'),
+        'HOST': os.environ.get('AA_DB_DEFAULT_HOST', '127.0.0.1'),
+        'PORT': os.environ.get('AA_DB_DEFAULT_PORT', '3306'),
+    },
+
+    'phpbb3': {
+        'ENGINE': 'django.db.backends.mysql',
+        'NAME': 'alliance_forum',
+        'USER': os.environ.get('AA_DB_PHPBB3_USER', 'allianceserver'),
+        'PASSWORD': os.environ.get('AA_DB_PHPBB3_PASSWORD', 'potato'),
+        'HOST': os.environ.get('AA_DB_PHPBB3_HOST', '127.0.0.1'),
+        'PORT': os.environ.get('AA_DB_PHPBB3_PORT', '3306'),
+    },
+
+    'mumble': {
+        'ENGINE': 'django.db.backends.mysql',
+        'NAME': 'alliance_mumble',
+        'USER': os.environ.get('AA_DB_MUMBLE_USER', 'allianceserver'),
+        'PASSWORD': os.environ.get('AA_DB_MUMBLE_PASSWORD', 'potato'),
+        'HOST': os.environ.get('AA_DB_MUMBLE_HOST', '127.0.0.1'),
+        'PORT': os.environ.get('AA_DB_MUMBLE_PORT', '3306'),
+    }
+}
+
+TEMPLATE_CONTEXT_PROCESSORS = (
+    'django.contrib.auth.context_processors.auth',
+    'django.core.context_processors.debug',
+    'django.core.context_processors.i18n',
+    'django.core.context_processors.media',
+    'django.core.context_processors.static',
+    'django.core.context_processors.tz',
+    'django.contrib.messages.context_processors.messages',
+    'django.core.context_processors.request',
+    'util.context_processors.corp_id',
+    'util.context_processors.corp_name',
+    'util.context_processors.jabber_url',
+    'util.context_processors.domain_url'
+)
+
+TEMPLATE_DIRS = (
+    'templates',
+    '/home/allianceserver/allianceauth/templates',
+)
+
+STATICFILES_DIRS = (
+    'static',
+    '/home/allianceserver/allianceauth/static',
+)
+
+LOGIN_URL = '/login_user/'
+
+# Internationalization
+# https://docs.djangoproject.com/en/1.6/topics/i18n/
+
+LANGUAGE_CODE = os.environ.get('AA_LANGUAGE_CODE', 'en-us')
+
+TIME_ZONE = os.environ.get('AA_TIME_ZONE', 'UTC')
+
+USE_I18N = True
+
+USE_L10N = True
+
+USE_TZ = True
+
+# Static files (CSS, JavaScript, Images)
+# https://docs.djangoproject.com/en/1.6/howto/static-files/
+STATIC_URL = '/static/'
+
+#####################################################
+##
+## Alliance configuration starts here
+##
+#####################################################
+
+#################
+# EMAIL SETTINGS
+#################
+# DOMAIN - The alliance auth domain_url
+# EMAIL_HOST - SMTP Server URL
+# EMAIL_PORT - SMTP Server PORT
+# EMAIL_HOST_USER - Email Username
+# EMAIL_HOST_PASSWORD - Email Password
+# EMAIL_USE_TLS - Set to use TLS encryption
+#################
+DOMAIN = os.environ.get('AA_DOMAIN', 'https://youarebeingmonitored.net')
+EMAIL_HOST = os.environ.get('AA_EMAIL_HOST', 'smtp.gmail.com')
+EMAIL_PORT = int(os.environ.get('AA_EMAIL_PORT', '587'))
+EMAIL_HOST_USER = os.environ.get('AA_EMAIL_HOST_USER', '')
+EMAIL_HOST_PASSWORD = os.environ.get('AA_EMAIL_HOST_PASSWORD', '')
+EMAIL_USE_TLS = 'True' == os.environ.get('AA_EMAIL_USE_TLS', 'True')
+
+#########################
+# Default Group Settings
+#########################
+# DEFAULT_ALLIANCE_GROUP - Default group alliance members are put in
+# DEFAULT_BLUE_GROUP - Default group for blue members
+#########################
+DEFAULT_AUTH_GROUP = os.environ.get('AA_DEFAULT_ALLIANCE_GROUP', 'Member')
+DEFAULT_BLUE_GROUP = os.environ.get('AA_DEFAULT_BLUE_GROUP', 'Blue')
+
+#########################
+# Alliance Service Setup
+#########################
+# ENABLE_ALLIANCE_FORUM - Enable forum support in the auth for alliance members
+# ENABLE_ALLIANCE_JABBER - Enable jabber support in the auth for alliance members
+# ENABLE_ALLIANCE_MUMBLE - Enable mumble support in the auth for alliance members
+# ENABLE_ALLIANCE_IPBOARD - Enable IPBoard forum support in the auth for alliance members
+#########################
+ENABLE_AUTH_FORUM = 'True' == os.environ.get('AA_ENABLE_AUTH_FORUM', 'True')
+ENABLE_AUTH_JABBER = 'True' == os.environ.get('AA_ENABLE_AUTH_JABBER', 'True')
+ENABLE_AUTH_MUMBLE = 'True' == os.environ.get('AA_ENABLE_AUTH_MUMBLE', 'True')
+ENABLE_AUTH_IPBOARD = 'True' == os.environ.get('AA_ENABLE_AUTH_IPBOARD', 'False')
+ENABLE_AUTH_TEAMSPEAK3 = 'True' == os.environ.get('AA_ENABLE_AUTH_TEAMSPEAK3', 'False')
+
+#####################
+# Blue service Setup
+#####################
+# ENABLE_BLUE_FORUM - Enable forum support in the auth for blues
+# ENABLE_BLUE_JABBER - Enable jabber support in the auth for blues
+# ENABLE_BLUE_MUMBLE - Enable mumble support in the auth for blues
+# ENABLE_BLUE_IPBOARD - Enable IPBoard forum support in the auth for blues
+#####################
+ENABLE_BLUE_FORUM = 'True' == os.environ.get('AA_ENABLE_BLUE_FORUM', 'False')
+ENABLE_BLUE_JABBER = 'True' == os.environ.get('AA_ENABLE_BLUE_JABBER', 'False')
+ENABLE_BLUE_MUMBLE = 'True' == os.environ.get('AA_ENABLE_BLUE_MUMBLE', 'True')
+ENABLE_BLUE_IPBOARD = 'True' == os.environ.get('AA_ENABLE_BLUE_IPBOARD', 'False')
+ENABLE_BLUE_TEAMSPEAK3 = 'True' == os.environ.get('AA_ENABLE_BLUE_TEAMSPEAK3', 'False')
+
+#########################
+# Alliance Configuration
+#########################
+# ALLIANCE_ID - Set this to your AllianceID 
+# ALLIANCE_NAME - Set this to your Alliance Name
+# ALLIANCE_EXEC_CORP_ID - Set this to the api id for the exec corp
+# ALLIANCE_EXEC_CORP_VCODE - Set this to the api vcode for the exe corp
+# ALLIANCE_BLUE_STANDING - The default lowest standings setting to consider blue
+########################
+CORP_ID = os.environ.get('AA_CORP_ID', '98382747')
+CORP_NAME = os.environ.get('AA_CORP_NAME', 'Super Secret Spaceship Syndicate')
+CORP_API_ID = os.environ.get('AA_CORP_API_ID', '4682782')
+CORP_API_VCODE = os.environ.get('AA_CORP_API_VCODE', 'hTdKJ2fND4ACxFimr6TNjjn7GATutmrDOR5BreoWtn6vsKhLGmjv9ORvFLjBfVdo')
+BLUE_STANDING = float(os.environ.get('AA_BLUE_STANDING', '5.0'))
+
+#####################
+# HR Configuration
+#####################
+# JACK_KNIFE_URL - Url for the audit page of API Jack knife
+#                  Should seriously replace with your own.
+#####################
+JACK_KNIFE_URL = os.environ.get('AA_JACK_KNIFE_URL', 'http://ridetheclown.com/eveapi/audit.php')
+
+#####################
+# Forum Configuration
+#####################
+# FORUM_URL - Forum url location
+# IPBOARD_ENDPOINT - Api endpoint if using ipboard
+# IPBOARD_APIKEY - Api key to interact with ipboard
+# IPBOARD_APIMODULE - Module for alliance auth *leave alone*
+#####################
+FORUM_URL = os.environ.get('AA_FORUM_URL', "127.0.0.1/forums")
+IPBOARD_ENDPOINT = os.environ.get('AA_IPBOARD_ENDPOINT', 'someaddress.com/interface/board/index.php')
+IPBOARD_APIKEY = os.environ.get('AA_IPBOARD_APIKEY', 'somekeyhere')
+IPBOARD_APIMODULE = 'aa'
+
+######################
+# Jabber Configuration
+######################
+# JABBER_URL - Jabber address url
+# JABBER_PORT - Jabber service portal
+# JABBER_SERVER - Jabber server url
+# OPENFIRE_ADDRESS - Address of the openfire admin console
+# OPENFIRE_SECRET_KEY - Openfire userservice secret key
+# BROADCAST_USER - Broadcast user JID
+# BROADCAST_USER_PASSWORD - Broadcast user password
+######################
+JABBER_URL = os.environ.get('AA_JABBER_URL', "127.0.01")
+JABBER_PORT = int(os.environ.get('AA_JABBER_PORT', '5223'))
+JABBER_SERVER = os.environ.get('AA_JABBER_SERVER', "mntr")
+OPENFIRE_ADDRESS = os.environ.get('AA_OPENFIRE_ADDRESS', "http://127.0.0.1:9090/")
+OPENFIRE_SECRET_KEY = os.environ.get('AA_OPENFIRE_SECRET_KEY', "somekey")
+BROADCAST_USER = os.environ.get('AA_BROADCAST_USER', "broadcast@") + JABBER_URL
+BROADCAST_USER_PASSWORD = os.environ.get('AA_BROADCAST_USER_PASSWORD', "somepassword")
+
+######################################
+# Mumble Configuration
+######################################
+# MUMBLE_URL - Mumble server url
+# MUMBLE_SERVER_ID - Mumble server id
+######################################
+MUMBLE_URL = os.environ.get('AA_MUMBLE_URL', "youarebeingmonitored.net")
+MUMBLE_SERVER_ID = int(os.environ.get('AA_MUMBLE_SERVER_ID', '1'))
+
+######################################
+# Teamspeak3 Configuration
+######################################
+# TEAMSPEAK3_SERVER_IP - Teamspeak3 server ip
+# TEAMSPEAK3_SERVER_PORT - Teamspeak3 server port
+# TEAMSPEAK3_SERVERQUERY_USER - Teamspeak3 serverquery username
+# TEAMSPEAK3_SERVERQUERY_PASSWORD - Teamspeak3 serverquery password
+# TEAMSPEAK3_VIRTUAL_SERVER - Virtual server id
+# TEAMSPEAK3_AUTHED_GROUP_ID - Default authed group id
+# TEAMSPEAK3_PUBLIC_URL - teamspeak3 public url used for link creation
+######################################
+TEAMSPEAK3_SERVER_IP = os.environ.get('AA_TEAMSPEAK3_SERVER_IP', '127.0.0.1')
+TEAMSPEAK3_SERVER_PORT = int(os.environ.get('AA_TEAMSPEAK3_SERVER_PORT', '10011'))
+TEAMSPEAK3_SERVERQUERY_USER = os.environ.get('AA_TEAMSPEAK3_SERVERQUERY_USER', 'serveradmin')
+TEAMSPEAK3_SERVERQUERY_PASSWORD = os.environ.get('AA_TEAMSPEAK3_SERVERQUERY_PASSWORD', 'passwordhere')
+TEAMSPEAK3_VIRTUAL_SERVER = int(os.environ.get('AA_TEAMSPEAK3_VIRTUAL_SERVER', '1'))
+TEAMSPEAK3_PUBLIC_URL = os.environ.get('AA_TEAMSPEAK3_PUBLIC_URL', 'someaddress.com')
diff --git a/hrapplications/forms.py b/hrapplications/forms.py
index 4e07f7c7..7d1ad0e7 100755
--- a/hrapplications/forms.py
+++ b/hrapplications/forms.py
@@ -1,11 +1,13 @@
 from django import forms
 from django.conf import settings
 
+from eveonline.models import EveCorporationInfo
+
 class HRApplicationForm(forms.Form):
     allchoices = []
 
     if settings.IS_CORP:
-        corp = EveCorporationInfo.objects.filter(corporation_id=settings.CORP_ID)
+        corp = EveCorporationInfo.objects.get(corporation_id=settings.CORP_ID)
         allchoices.append((str(corp.corporation_id), str(corp.corporation_name)))
     else:
         for corp in EveCorporationInfo.objects.all():
diff --git a/hrapplications/models.py b/hrapplications/models.py
index 585ee53c..3e6bd0ed 100755
--- a/hrapplications/models.py
+++ b/hrapplications/models.py
@@ -2,6 +2,7 @@ from django.db import models
 from django.contrib.auth.models import User
 
 from eveonline.models import EveCharacter
+from eveonline.models import EveCorporationInfo
 
 
 class HRApplication(models.Model):