diff --git a/yellow/routes.py b/yellow/routes.py
index 608bdd3..b2c9da9 100644
--- a/yellow/routes.py
+++ b/yellow/routes.py
@@ -1,4 +1,5 @@
 from quart import render_template, request, redirect, url_for, jsonify, Blueprint, abort, flash, send_from_directory, session
+import re
 
 from yellow import login_required
 from yellow.factory import openid
@@ -36,7 +37,7 @@ async def dashboard_address_post():
     # get FORM POST value 'address'
     form = await request.form
     address = form.get('address')
-    if len(address) != 97:
+    if not bool(re.match(r'^(WW)\\d[0-9A-Za-z]{94}$', address)):
         raise Exception("Please submit a WOW address")
 
     # update user