diff --git a/portal/forms/organisation.py b/portal/forms/organisation.py
index 6c059894f..98697810c 100644
--- a/portal/forms/organisation.py
+++ b/portal/forms/organisation.py
@@ -10,195 +10,125 @@
 class OrganisationForm(forms.ModelForm):
     county = forms.ChoiceField(
         choices=[
-            (None, "(select county)"),
-            # England
-            ("Avon", "Avon"),
-            ("Bath and North East Somerset", "Bath and North East Somerset"),
-            ("Bedfordshire", "Bedfordshire"),
-            ("Bedford", "Bedford"),
-            ("Berkshire", "Berkshire"),
-            ("Blackburn with Darwen", "Blackburn with Darwen"),
-            ("Blackpool", "Blackpool"),
-            ("Bournemouth, Christchurch and Poole", "Bournemouth, Christchurch and Poole"),
-            ("Bournemouth", "Bournemouth"),
-            ("Brighton and Hove", "Brighton and Hove"),
-            ("Bristol", "Bristol"),
-            ("Buckinghamshire", "Buckinghamshire"),
-            ("Cambridgeshire", "Cambridgeshire"),
-            ("Cambridgeshire and Isle of Ely", "Cambridgeshire and Isle of Ely"),
-            ("Central Bedfordshire", "Central Bedfordshire"),
-            ("Cheshire", "Cheshire"),
-            ("Cheshire East", "Cheshire East"),
-            ("Cheshire West and Chester", "Cheshire West and Chester"),
-            ("Cleveland", "Cleveland"),
-            ("Cornwall", "Cornwall"),
-            ("Cumberland", "Cumberland"),
-            ("Cumbria", "Cumbria"),
-            ("Darlington", "Darlington"),
-            ("Derbyshire", "Derbyshire"),
-            ("Derby", "Derby"),
-            ("Devon", "Devon"),
-            ("Dorset", "Dorset"),
-            ("Durham (County Durham)", "Durham (County Durham)"),
-            ("East Suffolk", "East Suffolk"),
-            ("East Sussex", "East Sussex"),
-            ("Essex", "Essex"),
-            ("Gloucestershire", "Gloucestershire"),
-            ("Greater London", "Greater London"),
-            ("Greater Manchester", "Greater Manchester"),
-            ("Hampshire", "Hampshire"),
-            ("Halton", "Halton"),
-            ("Hartlepool", "Hartlepool"),
-            ("Hereford and Worcester", "Hereford and Worcester"),
-            ("Herefordshire", "Herefordshire"),
-            ("Hertfordshire", "Hertfordshire"),
-            ("Humberside", "Humberside"),
-            ("Huntingdon and Peterborough", "Huntingdon and Peterborough"),
-            ("Huntingdonshire", "Huntingdonshire"),
-            ("Isle of Ely", "Isle of Ely"),
-            ("Isle of Wight", "Isle of Wight"),
-            ("Kent", "Kent"),
-            ("Kingston upon Hull", "Kingston upon Hull"),
-            ("Lancashire", "Lancashire"),
-            ("Leicestershire", "Leicestershire"),
-            ("Leicester", "Leicester"),
-            ("Lincolnshire", "Lincolnshire"),
-            ("Lincolnshire, Parts of Holland", "Lincolnshire, Parts of Holland"),
-            ("Lincolnshire, Parts of Kesteven", "Lincolnshire, Parts of Kesteven"),
-            ("Lincolnshire, Parts of Lindsey", "Lincolnshire, Parts of Lindsey"),
-            ("London", "London"),
-            ("City of London", "City of London"),
-            ("Luton", "Luton"),
-            ("Medway", "Medway"),
-            ("Merseyside", "Merseyside"),
-            ("Middlesbrough", "Middlesbrough"),
-            ("Middlesex", "Middlesex"),
-            ("Milton Keynes", "Milton Keynes"),
-            ("Norfolk", "Norfolk"),
-            ("Northamptonshire", "Northamptonshire"),
-            ("North East Lincolnshire", "North East Lincolnshire"),
-            ("North Humberside", "North Humberside"),
-            ("North Lincolnshire", "North Lincolnshire"),
-            ("North Northamptonshire", "North Northamptonshire"),
-            ("North Somerset", "North Somerset"),
-            ("Northumberland", "Northumberland"),
-            ("North Yorkshire", "North Yorkshire"),
-            ("Nottinghamshire", "Nottinghamshire"),
-            ("Nottingham", "Nottingham"),
-            ("Oxfordshire", "Oxfordshire"),
-            ("Soke of Peterborough", "Soke of Peterborough"),
-            ("Peterborough", "Peterborough"),
-            ("Plymouth", "Plymouth"),
-            ("Poole", "Poole"),
-            ("Portsmouth", "Portsmouth"),
-            ("Redcar and Cleveland", "Redcar and Cleveland"),
-            ("Rutland", "Rutland"),
-            ("Shropshire", "Shropshire"),
-            ("Somerset", "Somerset"),
-            ("Southampton", "Southampton"),
-            ("Southend-on-Sea", "Southend-on-Sea"),
-            ("South Humberside", "South Humberside"),
-            ("South Gloucestershire", "South Gloucestershire"),
-            ("South Yorkshire", "South Yorkshire"),
-            ("Staffordshire", "Staffordshire"),
-            ("Stockton-on-Tees", "Stockton-on-Tees"),
-            ("Stoke-on-Trent", "Stoke-on-Trent"),
-            ("Suffolk", "Suffolk"),
-            ("Surrey", "Surrey"),
-            ("Sussex", "Sussex"),
-            ("Swindon", "Swindon"),
-            ("Telford and Wrekin", "Telford and Wrekin"),
-            ("Thurrock", "Thurrock"),
-            ("Torbay", "Torbay"),
-            ("Tyne and Wear", "Tyne and Wear"),
-            ("Warrington", "Warrington"),
-            ("Warwickshire", "Warwickshire"),
-            ("West Midlands", "West Midlands"),
-            ("Westmorland", "Westmorland"),
-            ("Westmorland and Furness", "Westmorland and Furness"),
-            ("West Northamptonshire", "West Northamptonshire"),
-            ("West Suffolk", "West Suffolk"),
-            ("West Sussex", "West Sussex"),
-            ("West Yorkshire", "West Yorkshire"),
-            ("Wiltshire", "Wiltshire"),
-            ("Worcestershire", "Worcestershire"),
-            ("Yorkshire", "Yorkshire"),
-            ("Yorkshire, East Riding", "Yorkshire, East Riding"),
-            ("Yorkshire, North Riding", "Yorkshire, North Riding"),
-            ("Yorkshire, West Riding", "Yorkshire, West Riding"),
-            ("York", "York"),
-            # Northern Ireland
-            ("Antrim", "Antrim"),
-            ("Armagh", "Armagh"),
-            ("City of Belfast", "City of Belfast"),
-            ("Down", "Down"),
-            ("Fermanagh", "Fermanagh"),
-            ("Londonderry", "Londonderry"),
-            ("City of Derry", "City of Derry"),
-            ("Tyrone", "Tyrone"),
-            # Scotland
-            ("City of Aberdeen", "City of Aberdeen"),
-            ("Aberdeenshire", "Aberdeenshire"),
-            ("Angus (Forfarshire)", "Angus (Forfarshire)"),
-            ("Argyll", "Argyll"),
-            ("Ayrshire", "Ayrshire"),
-            ("Banffshire", "Banffshire"),
-            ("Berwickshire", "Berwickshire"),
-            ("Bute", "Bute"),
-            ("Caithness", "Caithness"),
-            ("Clackmannanshire", "Clackmannanshire"),
-            ("Cromartyshire", "Cromartyshire"),
-            ("Dumfriesshire", "Dumfriesshire"),
-            ("Dunbartonshire (Dumbarton)", "Dunbartonshire (Dumbarton)"),
-            ("City of Dundee", "City of Dundee"),
-            ("East Lothian (Haddingtonshire)", "East Lothian (Haddingtonshire)"),
-            ("City of Edinburgh", "City of Edinburgh"),
-            ("Fife", "Fife"),
-            ("City of Glasgow", "City of Glasgow"),
-            ("Inverness-shire", "Inverness-shire"),
-            ("Kincardineshire", "Kincardineshire"),
-            ("Kinross-shire", "Kinross-shire"),
-            ("Kirkcudbrightshire", "Kirkcudbrightshire"),
-            ("Lanarkshire", "Lanarkshire"),
-            ("Midlothian (County of Edinburgh)", "Midlothian (County of Edinburgh)"),
-            ("Moray (Elginshire)", "Moray (Elginshire)"),
-            ("Nairnshire", "Nairnshire"),
-            ("Orkney", "Orkney"),
-            ("Peeblesshire", "Peeblesshire"),
-            ("Perthshire", "Perthshire"),
-            ("Renfrewshire", "Renfrewshire"),
-            ("Ross and Cromarty", "Ross and Cromarty"),
-            ("Ross-shire", "Ross-shire"),
-            ("Roxburghshire", "Roxburghshire"),
-            ("Selkirkshire", "Selkirkshire"),
-            ("Shetland (Zetland)", "Shetland (Zetland)"),
-            ("Stirlingshire", "Stirlingshire"),
-            ("Sutherland", "Sutherland"),
-            ("West Lothian (Linlithgowshire)", "West Lothian (Linlithgowshire)"),
-            ("Wigtownshire", "Wigtownshire"),
-            # Wales
-            ("Anglesey", "Anglesey"),
-            ("Brecknockshire", "Brecknockshire"),
-            ("Caernarfonshire", "Caernarfonshire"),
-            ("Cardiganshire", "Cardiganshire"),
-            ("Carmarthenshire", "Carmarthenshire"),
-            ("Clwyd", "Clwyd"),
-            ("Denbighshire", "Denbighshire"),
-            ("Dyfed", "Dyfed"),
-            ("Flintshire", "Flintshire"),
-            ("Glamorgan", "Glamorgan"),
-            ("Gwent", "Gwent"),
-            ("Gwynedd", "Gwynedd"),
-            ("Merionethshire", "Merionethshire"),
-            ("Mid Glamorgan", "Mid Glamorgan"),
-            ("Monmouthshire", "Monmouthshire"),
-            ("Montgomeryshire", "Montgomeryshire"),
-            ("Pembrokeshire", "Pembrokeshire"),
-            ("Powys", "Powys"),
-            ("Radnorshire", "Radnorshire"),
-            ("South Glamorgan", "South Glamorgan"),
-            ("West Glamorgan", "West Glamorgan"),
-            ("Wrexham", "Wrexham"),
+            [None, "(select county)"],
+            ["Aberdeen City", "Aberdeen City"],
+            ["Aberdeenshire", "Aberdeenshire"],
+            ["Angus", "Angus"],
+            ["Argyll and Bute", "Argyll and Bute"],
+            ["Bedfordshire", "Bedfordshire"],
+            ["Belfast", "Belfast"],
+            ["Belfast Greater", "Belfast Greater"],
+            ["Berkshire", "Berkshire"],
+            ["Blaenau Gwent", "Blaenau Gwent"],
+            ["Bridgend", "Bridgend"],
+            ["Buckinghamshire", "Buckinghamshire"],
+            ["Caerphilly", "Caerphilly"],
+            ["Cambridgeshire", "Cambridgeshire"],
+            ["Cardiff", "Cardiff"],
+            ["Carmarthenshire", "Carmarthenshire"],
+            ["Ceredigion", "Ceredigion"],
+            ["Channel Islands", "Channel Islands"],
+            ["Cheshire", "Cheshire"],
+            ["City of Edinburgh", "City of Edinburgh"],
+            ["Clackmannanshire", "Clackmannanshire"],
+            ["Conwy", "Conwy"],
+            ["Cornwall", "Cornwall"],
+            ["County Antrim", "County Antrim"],
+            ["County Armagh", "County Armagh"],
+            ["County Down", "County Down"],
+            ["County Fermanagh", "County Fermanagh"],
+            ["County Londonderry", "County Londonderry"],
+            ["County Tyrone", "County Tyrone"],
+            ["County of Bristol", "County of Bristol"],
+            ["Cumbria", "Cumbria"],
+            ["Denbighshire", "Denbighshire"],
+            ["Derbyshire", "Derbyshire"],
+            ["Devon", "Devon"],
+            ["Dorset", "Dorset"],
+            ["Dumfries and Galloway", "Dumfries and Galloway"],
+            ["Dunbartonshire", "Dunbartonshire"],
+            ["Dundee City", "Dundee City"],
+            ["Durham", "Durham"],
+            ["East Ayrshire", "East Ayrshire"],
+            ["East Dunbartonshire", "East Dunbartonshire"],
+            ["East Lothian", "East Lothian"],
+            ["East Renfrewshire", "East Renfrewshire"],
+            ["East Riding of Yorkshire", "East Riding of Yorkshire"],
+            ["East Sussex", "East Sussex"],
+            ["Essex", "Essex"],
+            ["Falkirk", "Falkirk"],
+            ["Fife", "Fife"],
+            ["Flintshire", "Flintshire"],
+            ["Glasgow City", "Glasgow City"],
+            ["Gloucestershire", "Gloucestershire"],
+            ["Greater London", "Greater London"],
+            ["Greater Manchester", "Greater Manchester"],
+            ["Guernsey Channel Islands", "Guernsey Channel Islands"],
+            ["Gwynedd", "Gwynedd"],
+            ["Hampshire", "Hampshire"],
+            ["Hereford and Worcester", "Hereford and Worcester"],
+            ["Herefordshire", "Herefordshire"],
+            ["Hertfordshire", "Hertfordshire"],
+            ["Highland", "Highland"],
+            ["Inverclyde", "Inverclyde"],
+            ["Inverness", "Inverness"],
+            ["Isle of Anglesey", "Isle of Anglesey"],
+            ["Isle of Barra", "Isle of Barra"],
+            ["Isle of Man", "Isle of Man"],
+            ["Isle of Wight", "Isle of Wight"],
+            ["Jersey Channel Islands", "Jersey Channel Islands"],
+            ["Kent", "Kent"],
+            ["Lancashire", "Lancashire"],
+            ["Leicestershire", "Leicestershire"],
+            ["Lincolnshire", "Lincolnshire"],
+            ["Merseyside", "Merseyside"],
+            ["Merthyr Tydfil", "Merthyr Tydfil"],
+            ["Midlothian", "Midlothian"],
+            ["Monmouthshire", "Monmouthshire"],
+            ["Moray", "Moray"],
+            ["Neath Port Talbot", "Neath Port Talbot"],
+            ["Newport", "Newport"],
+            ["Norfolk", "Norfolk"],
+            ["North Ayrshire", "North Ayrshire"],
+            ["North Lanarkshire", "North Lanarkshire"],
+            ["North Yorkshire", "North Yorkshire"],
+            ["Northamptonshire", "Northamptonshire"],
+            ["Northumberland", "Northumberland"],
+            ["Nottinghamshire", "Nottinghamshire"],
+            ["Orkney", "Orkney"],
+            ["Orkney Islands", "Orkney Islands"],
+            ["Oxfordshire", "Oxfordshire"],
+            ["Pembrokeshire", "Pembrokeshire"],
+            ["Perth and Kinross", "Perth and Kinross"],
+            ["Powys", "Powys"],
+            ["Renfrewshire", "Renfrewshire"],
+            ["Rhondda Cynon Taff", "Rhondda Cynon Taff"],
+            ["Rutland", "Rutland"],
+            ["Scottish Borders", "Scottish Borders"],
+            ["Shetland Islands", "Shetland Islands"],
+            ["Shropshire", "Shropshire"],
+            ["Somerset", "Somerset"],
+            ["South Ayrshire", "South Ayrshire"],
+            ["South Lanarkshire", "South Lanarkshire"],
+            ["South Yorkshire", "South Yorkshire"],
+            ["Staffordshire", "Staffordshire"],
+            ["Stirling", "Stirling"],
+            ["Suffolk", "Suffolk"],
+            ["Surrey", "Surrey"],
+            ["Swansea", "Swansea"],
+            ["Torfaen", "Torfaen"],
+            ["Tyne and Wear", "Tyne and Wear"],
+            ["Vale of Glamorgan", "Vale of Glamorgan"],
+            ["Warwickshire", "Warwickshire"],
+            ["West Dunbart", "West Dunbart"],
+            ["West Lothian", "West Lothian"],
+            ["West Midlands", "West Midlands"],
+            ["West Sussex", "West Sussex"],
+            ["West Yorkshire", "West Yorkshire"],
+            ["Western Isles", "Western Isles"],
+            ["Wiltshire", "Wiltshire"],
+            ["Worcestershire", "Worcestershire"],
+            ["Wrexham", "Wrexham"],
         ],
         required=False,
         help_text="County (optional)",