diff --git a/heat/db/sqlalchemy/api.py b/heat/db/sqlalchemy/api.py
index f68560ccc4..dd800fe5be 100644
--- a/heat/db/sqlalchemy/api.py
+++ b/heat/db/sqlalchemy/api.py
@@ -166,9 +166,11 @@ def stack_delete(context, stack_id):
         session.delete(r)
 
     rt = s.raw_template
+    uc = s.user_creds
 
     session.delete(s)
     session.delete(rt)
+    session.delete(uc)
 
     session.flush()
 
diff --git a/heat/db/sqlalchemy/models.py b/heat/db/sqlalchemy/models.py
index 337ca728b5..25f63b0891 100644
--- a/heat/db/sqlalchemy/models.py
+++ b/heat/db/sqlalchemy/models.py
@@ -172,6 +172,8 @@ class UserCreds(BASE, HeatBase):
     aws_auth_url = Column(String)
     tenant_id = Column(String)
     aws_creds = Column(String)
+    stack = relationship(Stack,
+        backref=backref('user_creds'))
 
 
 class Event(BASE, HeatBase):