diff --git a/foundation/erpnext_foundation/doctype/foundation_fellowship/templates/foundation_fellowship.html b/foundation/erpnext_foundation/doctype/foundation_fellowship/templates/foundation_fellowship.html
index 33cf49fd..bae54e8a 100644
--- a/foundation/erpnext_foundation/doctype/foundation_fellowship/templates/foundation_fellowship.html
+++ b/foundation/erpnext_foundation/doctype/foundation_fellowship/templates/foundation_fellowship.html
@@ -42,9 +42,12 @@
                     <td>Github Id</td>
                     <td>{{ github_id }}</td>
                 </tr>
+                {% if website_url %}
                 </tr>
                     <td>Website</td>
+                    <td><a href="{{ website_url }}">{{ website_url }}</a></td>
                 </tr>
+                {% endif %}
             </table>
 
         </div>
diff --git a/foundation/erpnext_foundation/doctype/service_provider/templates/service_provider.html b/foundation/erpnext_foundation/doctype/service_provider/templates/service_provider.html
index e312e5ce..15e35e7b 100644
--- a/foundation/erpnext_foundation/doctype/service_provider/templates/service_provider.html
+++ b/foundation/erpnext_foundation/doctype/service_provider/templates/service_provider.html
@@ -34,10 +34,12 @@
 					<td><a href="mailto:{{ email }}" target="_blank">
 						{{ email }}</a></td>
 				</tr>
+				{% if website_url %}
 				</tr>
 					<td>Website</td>
-					<td><a href="{{ website }}" target="_blank">{{ website }}</a></td>
+					<td><a href="{{ website_url }}" target="_blank">{{ website_url }}</a></td>
 				</tr>
+				{% endif %}
 			</table>
 
 		</div>